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

Is merge broken?

From: Ignacy Gawedzki <svn_at_qult.net>
Date: 2005-04-03 04:34:00 CEST


I just had some trouble merging a branch back to the trunk. I isolated the
problem which can be reproduced this way:

  I created and committed a trunk with the following layout (r1)


  Then I copied the trunk into a branch (r2)

    svn cp trunk somebranch
    svn ci -m "created branch"

  Now, working on the branch I decide to delete bar/somefile.txt (r3)

    svn rm somebranch/bar/somefile.txt
    svn ci -m "deleted somefile.txt"

  Then, I decide that after all, the empty directory is useless (r4)

    svn rm somebranch/bar
    svn up
    svn ci -m "deleted empty bar"

  Finally, I want to put foo/bar one directory up (r5)

    svn mv somebranch/foo/bar somebranch
    svn ci -m "moved bar from foo to root"
  Suppose now I want to merge the branch with the trunk

    svn up
    svn merge -r3:5 somebranch trunk

  This is what I get

    D trunk/foo/bar/someotherfile.txt
    D trunk/foo/bar
    D trunk/bar/somefile.txt
    D trunk/bar
    svn: URL 'file:///opt/svn/someproject/somebranch/bar' doesn't match existing URL 'file:///opt/svn/someproject/trunk/bar' in 'trunk/bar'

If I try to merge with the --ignore-ancestry option, then bar/somefile.txt
isn't deleted...

P.S.  All information contained in the above letter is false,
      for reasons of military security.
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Apr 3 04:36:44 2005

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.