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

Re: Add -c option to merge

From: David James <james82_at_gmail.com>
Date: 2005-10-27 04:44:23 CEST

On 26 Oct 2005 08:22:39 -0500, kfogel@collab.net <kfogel@collab.net> wrote:
> Bruce DeVisser <bmdmail@sympatico.ca> writes:
> > Will you then start wishing for a simple option to merge them
> > back out? ;-) While not as common, it should probably still be
> > considered.
> Funny, I was just thinking that as I rode into work this morning.
> Can we have "-c -577" mean revert r577, that is "-r577:576" ?
> As long as we're having a convenient syntax for adding changes, we
> should make it easy to subtract them too.
When I want to revert changes using GNU patch, I use the "--reverse"
option. So, to revert r577 using svn, I'd want to type "svn merge
--reverse -c577". (I don't see a need for a short form version of this

Reverting multiple changes at once is simple using --reverse. Just
repeat the original merge command, but with "--reverse".
  svn merge --reverse -c16930,16975,16989,16990

The subtraction operator seems less clear than the "reverse" option.
If we merged four changes using svn merge -c16930,16975,16989,16990,
how would we revert the four changes?
A) svn merge -c-16930,16975,16989,16990
B) svn merge -c-16930,-16975,-16989,-16990
C) svn merge -c-16990,-16989,-16975,-16930



David James -- http://www.cs.toronto.edu/~james
Received on Thu Oct 27 04:45:40 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.