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 __________________________________________________________________________ Archie Cobbs * CTO, Awarix * http://www.awarix.com _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
