[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: Archie Cobbs <archie_at_dellroad.org>
Date: 2006-05-16 15:37:44 CEST

Giovanni Bajo wrote:
> 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.

Right.. and why "-" was chosen instead of ":", to help differentiate
that svnmerge works with "a set of revisions" whereas svn merge works
with "a patch/delta derived from revision numbers". That's why (to me
at least) if you're specifying "a set of revisions" then "456-123"
would be the empty set.

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

I agree.. the conservative thing to do now is bail if we see
a reversed range, at least until we decide what to do.


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

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:37:51 2006

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