Mercurial > hg-stable
changeset 7865:e9d4ed761c49
Fix new CVS test output
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 20 Mar 2009 18:49:44 -0500 |
| parents | c4a73d54126a |
| children | b2c18c795622 01bd0efef1b5 |
| files | tests/test-convert-cvs-synthetic.out |
| diffstat | 1 files changed, 4 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-cvs-synthetic.out Fri Mar 20 17:58:11 2009 -0500 +++ b/tests/test-convert-cvs-synthetic.out Fri Mar 20 18:49:44 2009 -0500 @@ -2,13 +2,9 @@ cvs checkout: Updating proj % create file1 on the trunk cvs add: scheduling file `file1' for addition -cvs add: use 'cvs commit' to add this file permanently -RCS file: *REPO*/proj/file1,v -done -Checking in file1; +cvs add: use `cvs commit' to add this file permanently *REPO*/proj/file1,v <-- file1 initial revision: 1.1 -done % create two branches cvs tag: Tagging . T file1 @@ -17,39 +13,25 @@ % create file2 on branch v1_0 cvs update: Updating . cvs add: scheduling file `file2' for addition on branch `v1_0' -cvs add: use 'cvs commit' to add this file permanently -RCS file: *REPO*/proj/Attic/file2,v -done -Checking in file2; +cvs add: use `cvs commit' to add this file permanently *REPO*/proj/Attic/file2,v <-- file2 new revision: 1.1.2.1; previous revision: 1.1 -done % create file3, file4 on branch v1_1 cvs update: Updating . -cvs update: file2 is no longer in the repository +cvs update: `file2' is no longer in the repository cvs add: scheduling file `file3' for addition on branch `v1_1' cvs add: scheduling file `file4' for addition on branch `v1_1' -cvs add: use 'cvs commit' to add these files permanently -RCS file: *REPO*/proj/Attic/file3,v -done -Checking in file3; +cvs add: use `cvs commit' to add these files permanently *REPO*/proj/Attic/file3,v <-- file3 new revision: 1.1.2.1; previous revision: 1.1 -done -RCS file: *REPO*/proj/Attic/file4,v -done -Checking in file4; *REPO*/proj/Attic/file4,v <-- file4 new revision: 1.1.2.1; previous revision: 1.1 -done % merge file2 from v1_0 to v1_1 cvs update: Updating . U file2 cvs commit: Examining . -Checking in file2; *REPO*/proj/Attic/file2,v <-- file2 new revision: 1.1.4.2; previous revision: 1.1.4.1 -done % convert to hg initializing destination proj.hg repository using builtin cvsps