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

Re: Can a merge follow changes in paths in trunk/branch?

From: Matt England <mengland_at_mengland.net>
Date: 2006-02-10 17:19:39 CET

Anybody know the answer to this? My tests suggest that a merge is not this
smart, but I want to confirm with the community, if possible, that I'm not
missing something.


At 2/9/2006 07:36 PM, Matt England wrote:
>One of my subversion-based software projects has made a branch. The trunk
>directory structure was (probably unfortunately) reorganized such that the
>files in the directories were not changed, but the director structure
>(names of dirs, moving of dirs, etc) were.
>I presume this will break the automated merging capability...or will
>it? I'm presuming that the merge works, fundamentally, as a recursive
>diff between 2 directories (and the docs appear to back that up).
>The next question: if we organize the branch to match the trunk's
>directory structure, will be able to merge again, as we would have
>originally if neither the branch nor the trunk directory structure had
>every changed?
>I plan on testing this behavior in an offline-test repo; I also thought it
>worth asking about here.
>Thanks for any help,
>To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: users-help@subversion.tigris.org

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 10 17:30:18 2006

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.