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

Add -c option to merge

From: Daniel Berlin <dberlin_at_dberlin.org>
Date: 2005-10-25 19:37:54 CEST

This adds an option "-c" (long form --change) that is shorthand for
"<rev -1>:<rev>", to merge.

The only thing i'm a little iffy on is whether we should add more state
just so we can tell the user they specified both "-r" and "-c", instead
of just saying we found multiple revision arguments (which could pop up
from multiple -c's, multiple -r's, or mixing -c and -r)

The -c option was discussed a while ago, and nobody seemed to object to
it. They only objected to allowing the same formats that svk allows,
instead of just the single revision form.

I'll wait a few days for objections or ideas or whatever before
committing.

[[[

  Add a -c option to merge to represent change number.

  * subversion/clients/cmdline/main.c
    (svn_cl__option): Add 'c'/'change' option.
    (svn_cl__commands): Merge can take 'c'.
    (main): Handle parsing for 'c'.

]]]

--Dan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Tue Oct 25 20:30:39 2005

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