Mercurial > hg
comparison tests/test-convert-cvs-synthetic.out @ 7865:e9d4ed761c49
Fix new CVS test output
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 20 Mar 2009 18:49:44 -0500 |
parents | 02981000012e |
children | d22432bdcba1 6c3b8132078e |
comparison
equal
deleted
inserted
replaced
7864:c4a73d54126a | 7865:e9d4ed761c49 |
---|---|
1 % create cvs repository with one project | 1 % create cvs repository with one project |
2 cvs checkout: Updating proj | 2 cvs checkout: Updating proj |
3 % create file1 on the trunk | 3 % create file1 on the trunk |
4 cvs add: scheduling file `file1' for addition | 4 cvs add: scheduling file `file1' for addition |
5 cvs add: use 'cvs commit' to add this file permanently | 5 cvs add: use `cvs commit' to add this file permanently |
6 RCS file: *REPO*/proj/file1,v | |
7 done | |
8 Checking in file1; | |
9 *REPO*/proj/file1,v <-- file1 | 6 *REPO*/proj/file1,v <-- file1 |
10 initial revision: 1.1 | 7 initial revision: 1.1 |
11 done | |
12 % create two branches | 8 % create two branches |
13 cvs tag: Tagging . | 9 cvs tag: Tagging . |
14 T file1 | 10 T file1 |
15 cvs tag: Tagging . | 11 cvs tag: Tagging . |
16 T file1 | 12 T file1 |
17 % create file2 on branch v1_0 | 13 % create file2 on branch v1_0 |
18 cvs update: Updating . | 14 cvs update: Updating . |
19 cvs add: scheduling file `file2' for addition on branch `v1_0' | 15 cvs add: scheduling file `file2' for addition on branch `v1_0' |
20 cvs add: use 'cvs commit' to add this file permanently | 16 cvs add: use `cvs commit' to add this file permanently |
21 RCS file: *REPO*/proj/Attic/file2,v | |
22 done | |
23 Checking in file2; | |
24 *REPO*/proj/Attic/file2,v <-- file2 | 17 *REPO*/proj/Attic/file2,v <-- file2 |
25 new revision: 1.1.2.1; previous revision: 1.1 | 18 new revision: 1.1.2.1; previous revision: 1.1 |
26 done | |
27 % create file3, file4 on branch v1_1 | 19 % create file3, file4 on branch v1_1 |
28 cvs update: Updating . | 20 cvs update: Updating . |
29 cvs update: file2 is no longer in the repository | 21 cvs update: `file2' is no longer in the repository |
30 cvs add: scheduling file `file3' for addition on branch `v1_1' | 22 cvs add: scheduling file `file3' for addition on branch `v1_1' |
31 cvs add: scheduling file `file4' for addition on branch `v1_1' | 23 cvs add: scheduling file `file4' for addition on branch `v1_1' |
32 cvs add: use 'cvs commit' to add these files permanently | 24 cvs add: use `cvs commit' to add these files permanently |
33 RCS file: *REPO*/proj/Attic/file3,v | |
34 done | |
35 Checking in file3; | |
36 *REPO*/proj/Attic/file3,v <-- file3 | 25 *REPO*/proj/Attic/file3,v <-- file3 |
37 new revision: 1.1.2.1; previous revision: 1.1 | 26 new revision: 1.1.2.1; previous revision: 1.1 |
38 done | |
39 RCS file: *REPO*/proj/Attic/file4,v | |
40 done | |
41 Checking in file4; | |
42 *REPO*/proj/Attic/file4,v <-- file4 | 27 *REPO*/proj/Attic/file4,v <-- file4 |
43 new revision: 1.1.2.1; previous revision: 1.1 | 28 new revision: 1.1.2.1; previous revision: 1.1 |
44 done | |
45 % merge file2 from v1_0 to v1_1 | 29 % merge file2 from v1_0 to v1_1 |
46 cvs update: Updating . | 30 cvs update: Updating . |
47 U file2 | 31 U file2 |
48 cvs commit: Examining . | 32 cvs commit: Examining . |
49 Checking in file2; | |
50 *REPO*/proj/Attic/file2,v <-- file2 | 33 *REPO*/proj/Attic/file2,v <-- file2 |
51 new revision: 1.1.4.2; previous revision: 1.1.4.1 | 34 new revision: 1.1.4.2; previous revision: 1.1.4.1 |
52 done | |
53 % convert to hg | 35 % convert to hg |
54 initializing destination proj.hg repository | 36 initializing destination proj.hg repository |
55 using builtin cvsps | 37 using builtin cvsps |
56 collecting CVS rlog | 38 collecting CVS rlog |
57 9 log entries | 39 9 log entries |