[Svnmerge] Renames/Moves followed by merge

[Nico Schellingerhout]

Rohan Joseph wrote:

> Hello All,
>
>             As most of you may be aware, svn implements 'renames' as a
> copy followed by a deleted. There is a very well known use scenario
> wherein a merge followed by a rename can completely complicate things.
>
>
> Edit foo.c on branch1
> On branch2, rename foo.c to bar.c
>
> Case I: merge branch1 -> branch2
> svn merge will skip the file, because it can't find it
>
> Case II: merge branch2 -> branch1
> svn merge will delete the 'newer' version of foo.c and add bar.c,
> which has the older text
>
> To the best of my knowledge, svnmerge.py also doesn't help in this
> case.  Does anyone have a work around to this?

We are working on a merge helper script for this (and a number of
other use cases).

We will contribute this script once it is sufficiently usable.

- Nico
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20080715/59d2c571/attachment.html>