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

svn loses changes when merging a moved file

From: <erh_at_swapsimple.com>
Date: 2005-07-08 17:23:19 CEST

        I ran into a problem with trying to merge changes to a file that was
moved. If I have a file, and a branch with the file, I normally merge the
changes on the branch with new changes from the trunk with a command like
this:
  cd /path/to/checkedout/branch
  svn merge -r123:124 http://blah/trunk

This works fine until I move a file on the trunk. The next time I do a
merge after that, the file gets moved on the branch, but ALL changes I
made on the branch are lost. Needless to say, that's bad, especially since
there's no indication that anything unusual happened.
        Is this a known problem? I'm using a slightly older version of svn(1.1.4)
Has this problem been fixed in a more recent release?

eric

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 8 17:25:45 2005

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