Complications with merge

Hi,

Say I have the following working copy structure:

wc_root/
    directory1/
    directory2/
    directory3/

Furthermore, let's assume that this working copy has been switched to a
feature branch of some sort (The same structure still applies to the
branch). Now, let's switch directory2 back to the trunk version. After that,
we perform a merge on "wc_root". When I do this, I see that the
svn:mergeinfo generated acts like changes from trunk were successfully
merged into directory2, when that can't be possible since it was switched.

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.
Received on 2008-09-05 00:35:04 CEST