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

Re: Complicated merge

From: Robert Dailey <rcdailey_at_gmail.com>
Date: Thu, 18 Sep 2008 15:06:48 -0500

On Tue, Sep 16, 2008 at 12:31 AM, Ben Collins-Sussman
<sussman_at_red-bean.com>wrote:

> On Mon, Sep 15, 2008 at 5:05 PM, Robert Dailey <rcdailey_at_gmail.com> wrote:
>
> > Basically, my concern comes down to this: When you have a working copy
> > with a bunch of sub-directories switched, what happens to the merge
> > process when it is done at the root of the working copy? It seems like
> > it breaks everything to have any sort of nested switches in your
> > working copy during a merge.
>
> You are correct, switched subdirs currently leads to broken merges;
> that's why the svnbook explicitly warns against this. See the list of
> caveats here, specifically the third bullet:
>
>
> http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword
>

Is it safe to merge a subdirectory of the branch into a matching sub
directory of the trunk? In other words, "cherry picking" my merges into
trunk? If I do this, how will this affect trying to merge the entire branch
over to trunk at the root level later? Will it try to merge the same
cherry-picked changes twice? How does cherry picking work when it comes down
to this specific scenario?
Received on 2008-09-18 22:07:03 CEST

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