Bug or feature: added file with conflict not shown as conflict

Today I fell over some strange behaviour with TortoiseSVN, so I retried
the operations with SVN and got the same results.

When you have an added file that has a non-resolved conflict, the
conflicted state is not shown. This state can happen when you merge
changes from one branch to another.

Here is a recipe (run under windows from folder d:/test/bt):

-----snip-----
if exist repo rd /s /q repo
if exist wc rd /s /q wc

svnadmin create repo
svn co file:///d:/test/bt/repo wc
cd wc
md branch1
md branch2
svn add branch1 branch2
svn ci . -m "created test branches"
echo line1 > branch1\test.txt
svn add branch1\test.txt
svn ci branch1 -m "created test file"
echo line2 >> branch1\test.txt
svn ci branch1 -m "added Line2"
svn up .

cd branch2
svn merge -r1:2 ..\branch1
svn st
echo Line2 test >> test.txt
svn merge -r2:3 ..\branch1
svn ci -m "try to commit"
-----snip-----

This gives an error:
svn: Commit failed (details follow):
svn: Aborting commit: 'D:\test\bt\wc\branch2\test.txt' remains in conflict

But "svn st test.txt" still displays:

A + test.txt

I would suggest that the conflicted state overrides the added state, so
the file should display as "C". And since the file's state is not
reported as conflicted, TortoiseSVN does not show the "Resolved" menu.

Bug or Feature?

Norbert

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 4 23:29:21 2005