Mercurial > hg-stable

changeset 7467:0d1c5e638d07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Brendan Cully <brendan@kublai.com>
date Wed, 03 Dec 2008 22:03:05 -0800
parents 05010666fb19 (current diff) 8f0305874701 (diff)
children e63843793f01 62e5d41b0a8b
files
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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