# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1228370585 28800
# Node ID 0d1c5e638d07a051bcfd0f2598dd144f7275f73b
# Parent  05010666fb19c323af31df875a082ecca97a7e0d# Parent  8f03058747018e2593d54eb8f3f7cfe798590208
Merge with crew

diff -r 05010666fb19 -r 0d1c5e638d07 tests/test-convert-cvs-branch
--- a/tests/test-convert-cvs-branch	Wed Dec 03 22:01:34 2008 -0800
+++ b/tests/test-convert-cvs-branch	Wed Dec 03 22:03:05 2008 -0800
@@ -28,8 +28,9 @@
 
 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
diff -r 05010666fb19 -r 0d1c5e638d07 tests/test-convert-cvs-branch.out
--- a/tests/test-convert-cvs-branch.out	Wed Dec 03 22:01:34 2008 -0800
+++ b/tests/test-convert-cvs-branch.out	Wed Dec 03 22:03:05 2008 -0800
@@ -1,10 +1,10 @@
 % 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