Merge mishap

I have a merge problem with SVN 1.3 or thereabouts; I wonder if this
is an old bug.

Scenario goes like this:

rev 10: branch trunk to branches/a
rev 20: make some changes to trunk/file1
rev 25: make some changes to branches/a/file1
rev 30: rename branches/a/files1 to branches/a/file2

Now merge revs 10:30 from branches/a to trunk.

Result: trunk now has "file2" with the changes that were in rev 25 on
the branch. "file1" is gone, because the rename amounts to a delete
of the old name.

The problem: the change in rev 20 to trunk/file1 is silently lost. It
should be a conflict.

Is this fixed in a more recent release? If not, it's a major bug that
needs fixing...

      paul

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-04 03:13:21 CEST