Mercurial > hg
diff tests/test-convert-cvs-synthetic.out @ 7862:02981000012e 1.2.1
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Wed, 18 Mar 2009 09:15:38 -0400 |
parents | |
children | e9d4ed761c49 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-convert-cvs-synthetic.out Wed Mar 18 09:15:38 2009 -0400 @@ -0,0 +1,72 @@ +% create cvs repository with one project +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; +*REPO*/proj/file1,v <-- file1 +initial revision: 1.1 +done +% create two branches +cvs tag: Tagging . +T file1 +cvs tag: Tagging . +T file1 +% 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; +*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 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; +*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 +collecting CVS rlog +9 log entries +creating changesets +4 changeset entries +connecting to *REPO* +scanning source... +sorting... +converting... +3 add file1 on trunk +2 add file2 on branch v1_0 +1 add file3, file4 on branch v1_1 +0 merge file2 from v1_0 to v1_1 +% hg log output +3 merge file2 from v1_0 to v1_1 +2 add file3, file4 on branch v1_1 +1 add file2 on branch v1_0 +0 add file1 on trunk