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

Patrick Mézard pmezard at gmail.com
Wed Oct 3 04:57:35 CDT 2007


Christian Ebert a écrit :
> # 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

Does the following work for you ? I think it is a bit simpler, and it 
works for me with 1.11.20 and 1.11.22.

# HG changeset patch
# User Patrick Mezard <pmezard at gmail.com>
# Date 1191405044 -7200
# Node ID 8be3fb0b56e144cd4850e9fb1461c2989354ead4
# Parent  1df76921aab32ee607c9daeb30fb2769f575162d
test-convert-cvs: handle older cvs client

diff -r 1df76921aab3 -r 8be3fb0b56e1 tests/test-convert-cvs
--- a/tests/test-convert-cvs    Tue Oct 02 20:22:33 2007 +0200
+++ b/tests/test-convert-cvs    Wed Oct 03 11:50:44 2007 +0200
@@ -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 '<--' |\
+    sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
  cd ..

  echo % convert again
diff -r 1df76921aab3 -r 8be3fb0b56e1 tests/test-convert-cvs.out
--- a/tests/test-convert-cvs.out        Tue Oct 02 20:22:33 2007 +0200
+++ b/tests/test-convert-cvs.out        Wed Oct 03 11:50:44 2007 +0200
@@ -21,14 +21,8 @@ a
  a
  c
  % commit new file revisions
-Checking in a;
-src/a,v  <--  a
-new revision: 1.2; previous revision: 1.1
-done
-Checking in b/c;
-src/b/c,v  <--  c
-new revision: 1.2; previous revision: 1.1
-done
+checking in src/a,v
+checking in src/b/c,v
  % convert again
  connecting to cvsrepo
  destination src-hg is a Mercurial repository



More information about the Mercurial-devel mailing list