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

Lost updates due to file moves

From: Christoph Bartoschek <bartoschek_at_or.uni-bonn.de>
Date: Mon, 2 Feb 2009 14:33:38 +0100

Hi,

we are still using version 1.3 together with svnmerge.py to do merge tracking.
Unfortunately this combination caused some lost updates in one branch and
lots of manual work to recover them.

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

Greetings
Christoph Bartoschek
Received on 2009-02-02 14:47:05 CET

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