Merge with crew

tests/test-convert-cvs-branch

@@ -1,60 +1,61 b''
 #!/bin/sh
 
 # This is http://www.selenic.com/mercurial/bts/issue1148
 
 "$TESTDIR/hghave" cvs || exit 80
 
 cvscall()
 {
     cvs -f "$@"
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "graphlog = " >> $HGRCPATH
 echo "[convert]" >> $HGRCPATH
 echo "cvsps=builtin" >> $HGRCPATH
 
 echo % create cvs repository
 mkdir cvsrepo
 cd cvsrepo
 export CVSROOT=`pwd`
 export CVS_OPTIONS=-f
 cd ..
 
 cvscall -q -d "$CVSROOT" init
 
 echo % Create a new project
 
 mkdir src
 cd src
-echo "1" > a > b
-cvscall import -m "init" src v0 r0
+echo "1" > a
+echo "1" > b
+cvscall import -m "init" src v0 r0 | sort
 cd ..
 cvscall co src
 cd src
 
 echo % Branch the project
 
 cvscall tag -b BRANCH
 cvscall up -r BRANCH
 
 echo % Modify file a, then b, then a 
 
 echo "2" > a
 cvscall ci -m "mod a" | grep '<--' | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 
 echo "2" > b
 cvscall ci -m "mod b" | grep '<--' | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 
 echo "3" > a
 cvscall ci -m "mod a again" | grep '<--' | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 
 echo % Convert
 
 cd ..
 hg convert src | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 
 echo % Check the result
 
 hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n'

tests/test-convert-cvs-branch.out

@@ -1,53 +1,53 b''
 % create cvs repository
 % Create a new project
+
+
 N src/a
 N src/b
-
 No conflicts created by this import
-
 cvs checkout: Updating src
 U src/a
 U src/b
 % Branch the project
 cvs tag: Tagging .
 T a
 T b
 cvs update: Updating .
 % Modify file a, then b, then a
 cvs commit: Examining .
 checking in src/a,v
 cvs commit: Examining .
 checking in src/b,v
 cvs commit: Examining .
 checking in src/a,v
 % Convert
 assuming destination src-hg
 initializing destination src-hg repository
 using builtin cvsps
 collecting CVS rlog
 7 log entries
 creating changesets
 5 changeset entries
 connecting to cvsrepo
 scanning source...
 sorting...
 converting...
 4 Initial revision
 3 init
 2 mod a
 1 mod b
 0 mod a again
 updating tags
 % Check the result
 o  5 () update tags files: .hgtags
 |
 | o  4 (BRANCH) mod a again files: a
 | |
 | o  3 (BRANCH) mod b files: b
 | |
 | o  2 (BRANCH) mod a files: a
 | |
 | o  1 (v0) init files:
 |/
 o  0 () Initial revision files: a b