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

Re: Merge and reverse merge dont seem to cancel out

From: Peter Samuelson <peter_at_p12n.org>
Date: Fri, 25 Jul 2008 11:07:03 -0500

[Paul Burba]
> Just to be clear, this is the use case we are talking about right?
>
> 1) Merge -rX:Y SOURCE WC_TARGET
>
> Some subtrees are added under WC_TARGET.
>
> No commit!
>
> 2) Reverse merge -c-N SOURCE WC_TARGET
>
> Where X <= N <= Y
> N is the revision responsible for some/all
> of the subtree adds.
>
> --force isn't used so the subtrees in question are
> skipped and remain scheduled for addition.

Correct. I don't know that it's _necessary_ to support this, but I
think it is something people will try to do.

-- 
Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-07-25 18:07:18 CEST

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.