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

Re: Lost updates due to file moves

From: Ryan Schmidt <subversion-2009a_at_ryandesign.com>
Date: Mon, 2 Feb 2009 14:24:29 -0600

On Feb 2, 2009, at 07:33, Christoph Bartoschek wrote:

> My question is whether the following still can happen with the current
> implementation of merge tracking in subversion 1.5?
>
> 1. In the trunk a file is moved to another directory:
>
> svn mv base/timer.C timing/timer.C
>
> 2. In a development branch the file is changed:
>
> svn ci -m "..." base/timer.C
>
> 3. The changes to the trunk are merged into the branch.
>
> svnmerge -b merge
>
>
> Now the changes in step 2. are lost.

Unfortunately that sounds plausible to me. Renames are a bit
problematic if you're working in a team.

> I am not sure that this three steps are
> enough to reproduce the problem but it is not the first time that this
> happened to us.
>
> Is the new merge tracking system able to track file movements in a
> sane way
> compared to the older version we use?

You could install Subversion 1.5 on a test system and test to see if
it works better for you in this regard.

But I think this is probably more a true-renames issue than a merging
issue.

http://subversion.tigris.org/issues/show_bug.cgi?id=898

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1092178

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-02 21:25:31 CET

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