[SVNMERGE][PATCH] handle -r X-Y, where X > Y

Archie Cobbs archie at dellroad.org
Mon May 15 19:13:26 PDT 2006


Giovanni Bajo wrote:
> Madan U Sreenivasan <madan at collab.net> wrote:
>>> [[[
>>> Accept -rX-Y, for all svnmerge commands, where X > Y.
>>> Before this patch, empty RevisionSet()s were created when X > Y.
> 
> Rationale? "svn merge" accepts the reversed order with a different semantic
> (reversed merge). I'm worried about the confusion that can issue. I am +1 on a
> patch that errors out when X > Y until there is agreement on how to best handle
> this.

I agree... arguably revisions "456-123" more likely means "the empty set".
Automated tools that use svnmerge might emit such reversed ranges,
and they would probably expect the empty set too.

This reminds me of an annoying problem I discovered in MySQL today,
which is that you can't say "... WHERE foo IN ( )" .. i.e, query
membership in an empty set (this is what some automatically generated
query strings may try to do).

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



More information about the Svnmerge mailing list