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

Re: Merge mishap

From: Ryan Schmidt <subversion-2008c_at_ryandesign.com>
Date: Thu, 4 Sep 2008 00:04:01 -0500

On Sep 3, 2008, at 8:12 PM, Paul Koning wrote:

> 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...

As far as I know, this unfortunate behavior still occurs with
Subversion 1.5.2, though I did not test it.

Possibly this issue:


And this:


And, for good measure, this:


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 07:04:34 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.