Re: Problems merging renamed file with contents changes

Colin D Bennett <cbennett@radsoft.com> writes:

> Is there an easier way to merge changes containing file moves on
> files you've changed? If someone else has renamed a file I've
> edited, and I merge in their changes, my changed file is
> conveniently deleted and the changes lost.

I misread your example below; I originally thought that 'svn merge'
was wiping out your local mods. But that's not true. Your file had
no local mods, so 'svn merge' happily deleted it.

(I tested this by hand, by the way, and we *do* prevent deletions
where local mods exist, so disregard karl's last mail about there
being a bug.)

Here's the problem: you asked 'svn merge' to merge in the differences
between two versions of joes-branch. And it did exactly that; that
difference was a rename (delete + add). But joe never merged in
*your* change to the file before he did the rename!

No changes have been lost; your newer version of the file is still
sitting somewhere in your own branch history.

The only way to prevent this is to have joe and bob coordinate their
branches better.

Karl and I have been discussing this though -- look for his comments.
We can definitely improve things here to prevent this confusion...

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 10 21:12:00 2002