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

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

From: Matt England <mengland_at_mengland.net>
Date: 2006-02-10 02:36:54 CET

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,
-Matt

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 10 02:38:45 2006

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