Mercurial > hg

comparison tests/test-convert-cvs.out @ 9602:fc493cb90bb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with redone c655432c2c24 (issue1860)
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 16 Oct 2009 11:19:39 +0200
parents ba42e3c6e602 56a5f80556f5
children 69ce7a10e593
comparison
equal deleted inserted replaced
9601:11ace5726d02 9602:fc493cb90bb1
10 U src/a 10 U src/a
11 U src/b/c 11 U src/b/c
12 % commit a new revision changing b/c 12 % commit a new revision changing b/c
13 checking in src/b/c,v 13 checking in src/b/c,v
14 % convert fresh repo 14 % convert fresh repo
15 warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
16 initializing destination src-hg repository 15 initializing destination src-hg repository
17 connecting to cvsrepo 16 connecting to cvsrepo
18 scanning source... 17 scanning source...
18 collecting CVS rlog
19 5 log entries
20 creating changesets
21 3 changeset entries
19 sorting... 22 sorting...
20 converting... 23 converting...
21 2 Initial revision 24 2 Initial revision
22 1 import 25 1 import
23 0 ci0 26 0 ci0
24 updating tags 27 updating tags
25 a 28 a
26 c 29 c
27 c 30 c
28 % convert fresh repo with --filemap 31 % convert fresh repo with --filemap
29 warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
30 initializing destination src-filemap repository 32 initializing destination src-filemap repository
31 connecting to cvsrepo 33 connecting to cvsrepo
32 scanning source... 34 scanning source...
35 collecting CVS rlog
36 5 log entries
37 creating changesets
38 3 changeset entries
33 sorting... 39 sorting...
34 converting... 40 converting...
35 2 Initial revision 41 2 Initial revision
36 1 import 42 1 import
37 filtering out empty revision 43 filtering out empty revision
45 0 Initial revision files: b/c 51 0 Initial revision files: b/c
46 % commit new file revisions 52 % commit new file revisions
47 checking in src/a,v 53 checking in src/a,v
48 checking in src/b/c,v 54 checking in src/b/c,v
49 % convert again 55 % convert again
50 warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4 56 connecting to cvsrepo
51 connecting to cvsrepo 57 scanning source...
52 scanning source... 58 collecting CVS rlog
59 7 log entries
60 creating changesets
61 4 changeset entries
53 sorting... 62 sorting...
54 converting... 63 converting...
55 0 ci1 64 0 ci1
56 a 65 a
57 a 66 a
58 c 67 c
59 c 68 c
60 c 69 c
61 % convert again with --filemap 70 % convert again with --filemap
62 warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4 71 connecting to cvsrepo
63 connecting to cvsrepo 72 scanning source...
64 scanning source... 73 collecting CVS rlog
74 7 log entries
75 creating changesets
76 4 changeset entries
65 sorting... 77 sorting...
66 converting... 78 converting...
67 0 ci1 79 0 ci1
68 c 80 c
69 c 81 c
76 U b/c 88 U b/c
77 T a 89 T a
78 T b/c 90 T b/c
79 checking in src/b/c,v 91 checking in src/b/c,v
80 % convert again 92 % convert again
81 warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4 93 connecting to cvsrepo
82 connecting to cvsrepo 94 scanning source...
83 scanning source... 95 collecting CVS rlog
96 8 log entries
97 creating changesets
98 5 changeset entries
84 sorting... 99 sorting...
85 converting... 100 converting...
86 0 ci2 101 0 ci2
87 a
88 c 102 c
89 d 103 d
90 % convert again with --filemap 104 % convert again with --filemap
91 warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4 105 connecting to cvsrepo
92 connecting to cvsrepo 106 scanning source...
93 scanning source... 107 collecting CVS rlog
108 8 log entries
109 creating changesets
110 5 changeset entries
94 sorting... 111 sorting...
95 converting... 112 converting...
96 0 ci2 113 0 ci2
97 c 114 c
98 d 115 d
99 4 ci2 files: b/c 116 4 ci2 files: b/c
100 3 ci1 files: b/c 117 3 ci1 files: b/c
101 2 update tags files: .hgtags 118 2 update tags files: .hgtags
102 1 ci0 files: b/c 119 1 ci0 files: b/c
103 0 Initial revision files: b/c 120 0 Initial revision files: b/c
121 % commit a new revision with funny log message
122 checking in src/a,v
123 % convert again
124 connecting to cvsrepo
125 scanning source...
126 collecting CVS rlog
127 9 log entries
128 creating changesets
129 6 changeset entries
130 sorting...
131 converting...
132 0 funny
133 o 6 (branch) funny
134 | ----------------------------
135 | log message files: a
104 o 5 (branch) ci2 files: b/c 136 o 5 (branch) ci2 files: b/c
137
138 o 4 () ci1 files: a b/c
105 | 139 |
106 | o 4 () ci1 files: a b/c 140 o 3 () update tags files: .hgtags
107 | | 141 |
108 | o 3 () update tags files: .hgtags 142 o 2 () ci0 files: b/c
109 | | 143 |
110 | o 2 () ci0 files: b/c
111 |/
112 | o 1 (INITIAL) import files: 144 | o 1 (INITIAL) import files:
113 |/ 145 |/
114 o 0 () Initial revision files: a b/c 146 o 0 () Initial revision files: a b/c
115 147
148 % testing debugcvsps
149 collecting CVS rlog
150 9 log entries
151 creating changesets
152 8 changeset entries
153 ---------------------
154 PatchSet 1
155 Date:
156 Author:
157 Branch: HEAD
158 Tag: (none)
159 Branchpoints: INITIAL
160 Log:
161 Initial revision
162
163 Members:
164 a:INITIAL->1.1
165
166 ---------------------
167 PatchSet 2
168 Date:
169 Author:
170 Branch: HEAD
171 Tag: (none)
172 Branchpoints: INITIAL, branch
173 Log:
174 Initial revision
175
176 Members:
177 b/c:INITIAL->1.1
178
179 ---------------------
180 PatchSet 3
181 Date:
182 Author:
183 Branch: INITIAL
184 Tag: start
185 Log:
186 import
187
188 Members:
189 a:1.1->1.1.1.1
190 b/c:1.1->1.1.1.1
191
192 ---------------------
193 PatchSet 4
194 Date:
195 Author:
196 Branch: HEAD
197 Tag: (none)
198 Log:
199 ci0
200
201 Members:
202 b/c:1.1->1.2
203
204 ---------------------
205 PatchSet 5
206 Date:
207 Author:
208 Branch: HEAD
209 Tag: (none)
210 Branchpoints: branch
211 Log:
212 ci1
213
214 Members:
215 a:1.1->1.2
216
217 ---------------------
218 PatchSet 6
219 Date:
220 Author:
221 Branch: HEAD
222 Tag: (none)
223 Log:
224 ci1
225
226 Members:
227 b/c:1.2->1.3
228
229 ---------------------
230 PatchSet 7
231 Date:
232 Author:
233 Branch: branch
234 Tag: (none)
235 Log:
236 ci2
237
238 Members:
239 b/c:1.1->1.1.2.1
240
241 ---------------------
242 PatchSet 8
243 Date:
244 Author:
245 Branch: branch
246 Tag: (none)
247 Log:
248 funny
249 ----------------------------
250 log message
251
252 Members:
253 a:1.2->1.2.2.1
254