Mercurial > hg > mercurial-crew-with-dirclash

changeset 5360:ac2ccdcf4539

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Wed, 03 Oct 2007 21:08:37 +0200
parents 9bdce4a7964c (current diff) 645a40777fd4 (diff)
children 6b72ceef7472 ff32b2725651
files tests/test-convert-cvs.out
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-convert-cvs
+++ b/tests/test-convert-cvs
@@ -38,7 +38,8 @@ echo % commit new file revisions
 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
--- a/tests/test-convert-cvs.out
+++ b/tests/test-convert-cvs.out
@@ -21,10 +21,8 @@ updating tags
 a
 c
 % commit new file revisions
-src/a,v  <--  a
-new revision: 1.2; previous revision: 1.1
-src/b/c,v  <--  b/c
-new revision: 1.2; previous revision: 1.1
+checking in src/a,v
+checking in src/b/c,v
 % convert again
 destination src-hg is a Mercurial repository
 connecting to cvsrepo