[PATCH] Make test-convert-cvs work with older cvs versions

Christian Ebert blacktrash at gmx.net
Wed Oct 3 09:00:48 UTC 2007


# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1191401886 -7200
# Node ID aab88216d64b343e3878758a3619611938e9cdae
# Parent  9bdce4a7964c338f4a337a1667f5dd930662a32c
Make test-convert-cvs work with older cvs versions

Needed eg. for cvs 1.11.20

diff --git a/tests/test-convert-cvs b/tests/test-convert-cvs
--- a/tests/test-convert-cvs
+++ b/tests/test-convert-cvs
@@ -38,7 +38,8 @@ cd src
 cd src
 echo a >> a
 echo c >> b/c
-cvs -q commit -mci1 . | sed -e 's:.*src/\(.*\),v:src/\1,v:g'
+cvs -q commit -mci1 . | grep -Exv 'Checking .*|done' \
+| sed -e 's:.*src/\(.*\),v:src/\1,v:g' -e 's:<--  .*/:<--  :'
 cd ..
 
 echo % convert again
diff --git a/tests/test-convert-cvs.out b/tests/test-convert-cvs.out
--- a/tests/test-convert-cvs.out
+++ b/tests/test-convert-cvs.out
@@ -23,7 +23,7 @@ c
 % commit new file revisions
 src/a,v  <--  a
 new revision: 1.2; previous revision: 1.1
-src/b/c,v  <--  b/c
+src/b/c,v  <--  c
 new revision: 1.2; previous revision: 1.1
 % convert again
 destination src-hg is a Mercurial repository




More information about the Mercurial-devel mailing list