On Fri, Oct 26, 2007 at 11:42:31AM +0200, Nick.Thompson@infineon.com wrote:
> Hi,
>
> Yesterday I was asked how to complete a merge from trunk, to a
> branched WC, when the branched code had been refactored. The merge
> from the trunk specified a revision range where certain files
> where in one directory, but the equivalent files and been moved
> (copy-with-history + delete) to another dir. The merge failed
> because in the 1.4.x series subversion doesn't have a "proper"
> rename function and can't find the files, so can't apply the merge
> "patch".
>
> Q: What is the best practice for completing such a merge?
>
> My answer was: Complete the refactoring operation again on the
> trunk (the to-branch merge was a pre merge-back-to-trunk updating
> activity) and then merge. Is there a better solution? Presumably,
> 1.5.0 of Subversion will not help and nothing short of completing
> the proper renaming issue will...?
This is a tree conflict problem. Subversion should detect the
conflicting moves and signal conflicts appropriately.
This is not easy to solve.
See the following:
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=131681
http://subversion.tigris.org/issues/show_bug.cgi?id=2282
http://subversion.tigris.org/servlets/BrowseList?list=dev&by=thread&from=362008
Any ideas welcome.
--
Stefan Sperling <stsp@elego.de> Software Developer
elego Software Solutions GmbH HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96
13355 Berlin Fax: +49 30 23 45 86 95
http://www.elego.de Geschaeftsfuehrer: Olaf Wagner
- application/pgp-signature attachment: stored
Received on Fri Oct 26 13:02:28 2007