Re: Complicated merge

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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-16 07:31:34 CEST