Merge with crew

tests/test-convert-cvs-branch

@@ -28,8 +28,9 b' 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

tests/test-convert-cvs-branch.out

@@ -1,10 +1,10 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