[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: Giovanni Bajo <rasky_at_develer.com>
Date: 2006-05-16 14:26:58 CEST

Raman Gupta wrote:

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

The problem with this kind of implicit assumption is that it's not clear
anymore what to do with "svnmerge merge -r100-80,10". Or worse, with
"svnmerge merge -r80-100,200-180".

I would like to note that svnmerge.py uses --revisions just like the
newly-added -c option of svn diff/merge. In other words, it identifies a
changeset, more than a revision. This is why the correct spelling is
"svnmerge.py merge -r123", while with svn you need to say "svnmerge.py
merge -r122:123". This contributes to the current confusion.

Sooner or later, we ought to rename "-r/--revision" to "-c/--changeset".
After that, and after we gain the svnmerge rollback command, I think we
could rediscuss the issue. Until then, I'm still +1 on a patch which *errors
out* when specifying reversed ranges so to totally avoid any kind of

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

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