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

Strange tree conflict problem

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: Fri, 11 Feb 2011 13:13:03 +0100


I am merging the diff between branch A and branch B to a working copy of
branch C.

Now I get a tree conflict for some files. TortoiseSVN 1.6.12 says "The
last merge operation tried to delete/move/rename the file 'name', but it
was already edited."

I also get a tree conflict, if I do the merge with the svn commandline
client 1.6.12.

The strange thing is:
When I do a diff between the file in branch A and in branch B, it is not
different at all. So what does it want to merge?

Also, the file does exist in the target working copy and it is not
locally modified.

Our server runs svn 1.6.13.

Any help would be greatly appreciated.

Received on 2011-02-11 13:14:14 CET

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.