[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-05-16 08:46:10 CEST

On Tue, 16 May 2006 11:23:52 +0530, Giovanni Bajo <rasky@develer.com>

> Madan U Sreenivasan <madan@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".

That is exactly why I would expect a svnmerge user to give -r 45-30
instead of -r 30-45 (I did that myself when writing the tests).

> 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".

I think svnmerge shouldnt imitate that behavior. esp 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.

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

I can understand. But seriously, this is something thats waiting to be
done... just a matter of time before people understand that X-Y and Y-X
can be used interchangeably in svnmerge.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 16 08:15:54 2006

This is an archived mail posted to the Subversion Dev mailing list.