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

Madan U Sreenivasan madan at collab.net
Tue May 16 05:54:32 PDT 2006


On Tue, 16 May 2006 17:09:03 +0530, Raman Gupta <rocketraman at fastmail.fm>  
wrote:

[snip]
> If you have an expectation that -r45-30 is different from -r30-45 (as
> I think would most people), why do you want to write code that will
> make those two things equivalent?

I already explained why... This is why:
>> since we are
>> planning two seperate commands merge/rollback which decide the
>> direction of the merge. so the order of the revision range becomes
>> redundant.
> To me, X-Y and Y-X mean something different,

Sure, coming from 'svn merge' I can understand why.

> and I
> don't believe that svnmerge.py should make them equivalent.
> I'd rather that you "imply" a rollback command when the user specified
> Y-X, since that would be consistent with the behavior of svn merge.

Am not entirely sure, but I think we are looking at two commands, merge  
and rollback as far as svnmerge is concerned.

But, even to satisfy this *implicit* rollback (if X > Y), this patch needs  
to be committed.

Regards,
Madan.



More information about the Svnmerge mailing list