On Oct 22, 2:25 am, Stefan Sperling <s...@elego.de> wrote: > > Your reproduction recipe is incomplete.
I think I left out the import..lemme try again: DIR=$PWD mkdir -p $DIR/src/trunk/dir1 mkdir -p $DIR/src/trunk/dir2 mkdir -p $DIR/src/branches touch $DIR/src/trunk/dir1/file1.txt touch $DIR/src/trunk/dir2/file2.txt svnadmin create $DIR/testrepo svn import -m "Import test directory" $DIR/src file://$DIR/testrepo svn cp file://$DIR/testrepo/trunk file://$DIR/testrepo/branches/testbranch -m "Create test branch" svn co --non-recursive file://$DIR/testrepo/trunk test svn update test/dir1 print "Changes" >$DIR/test/dir1/file1.txt svn commit -m "Commit file1 changes" test cd test svn switch file://$DIR/testrepo/branches/testbranch svn merge -r 2:3 file://$DIR/testrepo/trunk . svn diff
