# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1200956923 -3600
# Node ID badf5711bd8681a03f0e1769090ccf68f84a2762
# Parent  1716c8a0bd092702739f1dcc8846da96f983fd6b
Test for converting a CVS branch

diff -r 1716c8a0bd09 -r badf5711bd86 tests/test-convert-cvs
--- a/tests/test-convert-cvs	Mon Jan 21 22:24:28 2008 +0100
+++ b/tests/test-convert-cvs	Tue Jan 22 00:08:43 2008 +0100
@@ -65,3 +65,25 @@
 cat src-hg/b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 
+echo % commit branch
+cd src
+cvs -q update -r1.1 b/c
+cvs -q tag -b branch
+cvs -q update -r branch
+echo d >> b/c
+cvs -q commit -mci2 . | grep '<--' |\
+    sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
+cd ..
+
+echo % convert again
+hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
+cat src-hg/a
+cat src-hg/b/c
+
+echo % convert again with --filemap
+hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
+cat src-hg/b/c
+hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
+
+echo "graphlog = " >> $HGRCPATH
+hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n'
diff -r 1716c8a0bd09 -r badf5711bd86 tests/test-convert-cvs.out
--- a/tests/test-convert-cvs.out	Mon Jan 21 22:24:28 2008 +0100
+++ b/tests/test-convert-cvs.out	Tue Jan 22 00:08:43 2008 +0100
@@ -69,3 +69,45 @@
 2 update tags files: .hgtags
 1 ci0 files: b/c
 0 Initial revision files: b/c
+% commit branch
+U b/c
+T a
+T b/c
+checking in src/b/c,v
+% convert again
+destination src-hg is a Mercurial repository
+connecting to cvsrepo
+scanning source...
+sorting...
+converting...
+0 ci2
+a
+a
+c
+d
+% convert again with --filemap
+destination src-filemap is a Mercurial repository
+connecting to cvsrepo
+scanning source...
+sorting...
+converting...
+0 ci2
+c
+d
+4 ci2 files: b/c
+3 ci1 files: b/c
+2 update tags files: .hgtags
+1 ci0 files: b/c
+0 Initial revision files: b/c
+o  5 (branch) ci2 files: b/c
+|
+o  4 () ci1 files: a b/c
+|
+o  3 () update tags files: .hgtags
+|
+o  2 () ci0 files: b/c
+|
+| o  1 (INITIAL) import files:
+|/
+o  0 () Initial revision files: a b/c
+