Unusable working copy after add/rm/add/merge

Hi folks,

This was reported on the TSVN list today.
Add file and commit
Delete file and commit
Add same filename again and commit.
Merge -r3:1 to revert to original file.
WC is terminally broken.

It's a bit contrived, but it shouldn't break the WC.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org

if exist repos rd /s/q repos
if exist wc rd /s/q wc
md repos
md wc
svnadmin create repos
:: Sorry about the absolute path here
svn co file:///c:/temp/mergebug/repos wc
cd wc
:: Create a file and add it
echo TestA > TestA.txt
svn add TestA.txt
svn ci -m "r1" .
:: Delete the file
svn rm TestA.txt
svn ci -m "r2" .
:: Create same filename again with same or different content
echo TestA2 > TestA.txt
svn add TestA.txt
svn ci -m "r3" .
:: Try to undo revisions 2 and 3
svn merge -r3:1 .
:: Broken WC ...
svn up
svn up
pause
cd..

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 10 12:33:51 2006