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

Giovanni Bajo rasky at develer.com
Mon May 15 22:53:52 PDT 2006


Madan U Sreenivasan <madan at collab.net> wrote:

>> "svn merge" accepts the reversed order with a different semantic
>> (reversed merge).
>
> I only know that 'svn merge' understands a reverse merge if you
> simply say -r 45-30. Am sorry, could you explain this different
> semantic?

"svn merge -r45:30" is the exact reverse of "svn merge -r30:45". Basically, the
former is a rollback command. Also "svn diff -r45:30" produces the reverse
patch. So there is precedence within SVN that X:Y (with X>Y) means the reversed
set of changes. Generically, X:Y means "the set of changes which can be applied
to revision X to obtain revision Y".

This is why I'm hesitant on having svnmerge accept reversed ranges and
normalize them.

Giovanni Bajo




More information about the Svnmerge mailing list