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

Re: Complications with merge

From: Robert Dailey <rcdailey_at_gmail.com>
Date: Fri, 12 Sep 2008 16:18:21 -0500

On Thu, Sep 4, 2008 at 5:34 PM, Robert Dailey <rcdailey_at_gmail.com> wrote:

> 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.

Can I get no response on this matter? Perhaps I need to post to the
developer mailing list?
Received on 2008-09-12 23:18:45 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.