[PATCH] tests: allow cvs import to reorder its filename list
Frank Kingswood
frank at kingswood-consulting.co.uk
Mon Dec 1 08:24:18 CST 2008
# HG changeset patch
# User Frank Kingswood <frank at kingswood-consulting.co.uk>
# Date 1228138924 0
# Node ID b1c1b4f98b74bfa32991d33bdb4a47215cdeb842
# Parent 79d1bb737c16b343e33be7cd7e22dcc4e7bfab0b
tests: allow cvs import to reorder its filename list
also fix script to generate non-zero length test file b.
diff -r 79d1bb737c16 -r b1c1b4f98b74 tests/test-convert-cvs-branch
--- a/tests/test-convert-cvs-branch Mon Dec 01 14:20:20 2008 +0100
+++ b/tests/test-convert-cvs-branch Mon Dec 01 13:42:04 2008 +0000
@@ -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 79d1bb737c16 -r b1c1b4f98b74 tests/test-convert-cvs-branch.out
--- a/tests/test-convert-cvs-branch.out Mon Dec 01 14:20:20 2008 +0100
+++ b/tests/test-convert-cvs-branch.out Mon Dec 01 13:42:04 2008 +0000
@@ -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
More information about the Mercurial
mailing list