Mercurial > hg
changeset 5365:ac2ccdcf4539
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 | ff32b2725651 6b72ceef7472 |
| files | tests/test-convert-cvs.out |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-cvs Tue Oct 02 21:01:00 2007 -0700 +++ b/tests/test-convert-cvs Wed Oct 03 21:08:37 2007 +0200 @@ -38,7 +38,8 @@ 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 Tue Oct 02 21:01:00 2007 -0700 +++ b/tests/test-convert-cvs.out Wed Oct 03 21:08:37 2007 +0200 @@ -21,10 +21,8 @@ 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