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

Complicated merge

From: Robert Dailey <rcdailey_at_gmail.com>
Date: Mon, 15 Sep 2008 17:05:14 -0500

Hi,

I originally posted this on the subverison user mailing list but I
received no response after over a week. I'm assuming this is a very
technical question that requires a subversion developer to obtain an
answer, so I'll re-post the inquiry to this mailing list. Help on this
matter is greatly appreciated. The contents of the original message
are below:

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.

---------------------------------------------------------------------
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 00:05:25 CEST

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