diff tests/test-convert-svn-branches @ 6540:55bd855fc0af

convert: improve subversion branch filtering

--- a/tests/test-convert-svn-branches	Mon Apr 14 22:31:33 2008 +0200
+++ b/tests/test-convert-svn-branches	Mon Apr 14 22:31:33 2008 +0200
@@ -66,6 +66,14 @@
 "$TESTDIR/svn-safe-append.py" b branches/old/b
 svn ci -m "change b again"
 
+echo % move back and forth between branch of similar names
+# This used to generate fake copy records
+svn up
+svn move branches/old branches/old2
+svn ci -m "move to old2"
+svn move branches/old2 branches/old
+svn ci -m "move back to old"
+
 echo % update trunk again
 "$TESTDIR/svn-safe-append.py" a trunk/a
 svn ci -m "last change to a"
@@ -76,15 +84,15 @@
 
 echo % branch again from a converted revision
 cd A
-svn copy -r 1 $svnurl/trunk branches/old2
-svn ci -m "branch trunk@1 into old2"
+svn copy -r 1 $svnurl/trunk branches/old3
+svn ci -m "branch trunk@1 into old3"
 cd ..
 
 echo % convert again
 hg convert --datesort $svnurl A-hg
 
 cd A-hg
-hg glog --template '#rev# #desc|firstline# files: #files#\n'
+hg glog --template 'branch=#branches# #rev# #desc|firstline# files: #files#\n'
 hg branches | sed 's/:.*/:/'
 hg tags -q
 cd ..