Mercurial > hg
comparison tests/test-convert-cvsnt-mergepoints.out @ 8818:727f7aaefaab
Rename CVSNT "mergepoints" test and make it executable.
- rename test-convert-cvs-builtincvsps-cvsnt-mergepoints
(and related files) to test-convert-cvsnt-mergepoints
- this ensures that the test will be run, but does NOT make
it pass: in particularly, it fails regularly for me due
to the inconsistent behaviour of CVS itself
- expect "Branchpoints:" in debugcvsps output
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Jun 2009 20:35:19 -0400 |
parents | tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.out@3e7611a83230 |
children | e93ab347c814 |
comparison
equal
deleted
inserted
replaced
8817:6c9dce20ed70 | 8818:727f7aaefaab |
---|---|
1 % create cvs repository | |
2 U cvsworktmp/CVSROOT/checkoutlist | |
3 U cvsworktmp/CVSROOT/commitinfo | |
4 U cvsworktmp/CVSROOT/config | |
5 U cvsworktmp/CVSROOT/cvswrappers | |
6 U cvsworktmp/CVSROOT/loginfo | |
7 U cvsworktmp/CVSROOT/modules | |
8 U cvsworktmp/CVSROOT/notify | |
9 U cvsworktmp/CVSROOT/postadmin | |
10 U cvsworktmp/CVSROOT/postproxy | |
11 U cvsworktmp/CVSROOT/posttag | |
12 U cvsworktmp/CVSROOT/postwatch | |
13 U cvsworktmp/CVSROOT/preproxy | |
14 U cvsworktmp/CVSROOT/rcsinfo | |
15 U cvsworktmp/CVSROOT/taginfo | |
16 U cvsworktmp/CVSROOT/verifymsg | |
17 | |
18 cvs add: use `cvs commit' to add this file permanently | |
19 checking in | |
20 initial revision: 1.1 | |
21 U cvswork/foo.txt | |
22 checking in | |
23 new revision: 1.1.2.1; previous revision: 1.1 | |
24 checking in | |
25 new revision: 1.1.2.2; previous revision: 1.1.2.1 | |
26 checking in | |
27 new revision: 1.1.2.2.2.1; previous revision: 1.1.2.2 | |
28 U foo.txt | |
29 checking in | |
30 new revision: 1.1.4.1; previous revision: 1.1 | |
31 rcsmerge: warning: conflicts during merge | |
32 merging MYBRANCH1 | |
33 retrieving revision 1.1 | |
34 retrieving revision 1.1.2.2 | |
35 Merging differences between 1.1 and 1.1.2.2 into foo.txt | |
36 checking in | |
37 new revision: 1.1.4.2; previous revision: 1.1.4.1 | |
38 U foo.txt | |
39 merging MYBRANCH1_2 | |
40 retrieving revision 1.1 | |
41 retrieving revision 1.1.2.2.2.1 | |
42 Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt | |
43 checking in | |
44 new revision: 1.2; previous revision: 1.1 | |
45 collecting CVS rlog | |
46 7 log entries | |
47 creating changesets | |
48 7 changeset entries | |
49 --------------------- | |
50 PatchSet 1 | |
51 Date: | |
52 Author: | |
53 Branch: HEAD | |
54 Tag: (none) | |
55 Branchpoints: MYBRANCH1_1, MYBRANCH1 | |
56 Log: | |
57 foo.txt | |
58 | |
59 Members: | |
60 foo.txt:INITIAL->1.1 | |
61 | |
62 --------------------- | |
63 PatchSet 2 | |
64 Date: | |
65 Author: | |
66 Branch: MYBRANCH1 | |
67 Tag: (none) | |
68 Parent: 1 | |
69 Log: | |
70 bar | |
71 | |
72 Members: | |
73 foo.txt:1.1->1.1.2.1 | |
74 | |
75 --------------------- | |
76 PatchSet 3 | |
77 Date: | |
78 Author: | |
79 Branch: MYBRANCH1 | |
80 Tag: (none) | |
81 Branchpoints: MYBRANCH1_2 | |
82 Parent: 2 | |
83 Log: | |
84 baz | |
85 | |
86 Members: | |
87 foo.txt:1.1.2.1->1.1.2.2 | |
88 | |
89 --------------------- | |
90 PatchSet 4 | |
91 Date: | |
92 Author: | |
93 Branch: MYBRANCH1_1 | |
94 Tag: (none) | |
95 Parent: 1 | |
96 Log: | |
97 quux | |
98 | |
99 Members: | |
100 foo.txt:1.1->1.1.4.1 | |
101 | |
102 --------------------- | |
103 PatchSet 5 | |
104 Date: | |
105 Author: | |
106 Branch: MYBRANCH1_2 | |
107 Tag: (none) | |
108 Parent: 3 | |
109 Log: | |
110 bazzie | |
111 | |
112 Members: | |
113 foo.txt:1.1.2.2->1.1.2.2.2.1 | |
114 | |
115 --------------------- | |
116 PatchSet 6 | |
117 Date: | |
118 Author: | |
119 Branch: HEAD | |
120 Tag: (none) | |
121 Parents: 1,5 | |
122 Log: | |
123 merge | |
124 | |
125 Members: | |
126 foo.txt:1.1->1.2 | |
127 | |
128 --------------------- | |
129 PatchSet 7 | |
130 Date: | |
131 Author: | |
132 Branch: MYBRANCH1_1 | |
133 Tag: (none) | |
134 Parents: 4,3 | |
135 Log: | |
136 merge | |
137 | |
138 Members: | |
139 foo.txt:1.1.4.1->1.1.4.2 | |
140 |