Mercurial > hgsubversion

comparison tests/fixtures/replace_branch_with_branch.svndump @ 588:2723152c8111

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stupid: fix getcopies() logic getcopies() assumed that copies where happening withing the current branch. This is wrong when a branch replaces another, and used to generate wrong copy records when copy sources existed in parent revision but were coming from an unrelated revision.
author Patrick Mezard <pmezard@gmail.com>
date Tue, 02 Mar 2010 17:06:06 +0100
parents c06f59441f8e
children
comparison
equal deleted inserted replaced
587:c06f59441f8e 588:2723152c8111
1 SVN-fs-dump-format-version: 2 1 SVN-fs-dump-format-version: 2
2 2
3 UUID: a88ce668-5208-4e23-8d73-bebfb2ebee53 3 UUID: 6c4a9db2-8b38-4988-bc82-df1f3bb0afcd
4 4
5 Revision-number: 0 5 Revision-number: 0
6 Prop-content-length: 56 6 Prop-content-length: 56
7 Content-length: 56 7 Content-length: 56
8 8
9 K 8 9 K 8
10 svn:date 10 svn:date
11 V 27 11 V 27
12 2010-03-01T20:45:07.143960Z 12 2010-03-01T23:13:19.505202Z
13 PROPS-END 13 PROPS-END
14 14
15 Revision-number: 1 15 Revision-number: 1
16 Prop-content-length: 108 16 Prop-content-length: 108
17 Content-length: 108 17 Content-length: 108
25 V 7 25 V 7
26 pmezard 26 pmezard
27 K 8 27 K 8
28 svn:date 28 svn:date
29 V 27 29 V 27
30 2010-03-01T20:45:08.063083Z 30 2010-03-01T23:13:20.066689Z
31 PROPS-END 31 PROPS-END
32 32
33 Node-path: branches 33 Node-path: branches
34 Node-kind: dir 34 Node-kind: dir
35 Node-action: add 35 Node-action: add
74 V 7 74 V 7
75 pmezard 75 pmezard
76 K 8 76 K 8
77 svn:date 77 svn:date
78 V 27 78 V 27
79 2010-03-01T20:45:11.044475Z 79 2010-03-01T23:13:23.056920Z
80 PROPS-END 80 PROPS-END
81 81
82 Node-path: branches/branch1 82 Node-path: branches/branch1
83 Node-kind: dir 83 Node-kind: dir
84 Node-action: add 84 Node-action: add
99 V 7 99 V 7
100 pmezard 100 pmezard
101 K 8 101 K 8
102 svn:date 102 svn:date
103 V 27 103 V 27
104 2010-03-01T20:45:13.068264Z 104 2010-03-01T23:13:25.099593Z
105 PROPS-END 105 PROPS-END
106 106
107 Node-path: branches/branch1/b 107 Node-path: branches/branch1/b
108 Node-kind: file 108 Node-kind: file
109 Node-action: add 109 Node-action: add
148 Text-content-sha1: 094e3afb2fe8dfe82f63731cdcd3b999f4856cff 148 Text-content-sha1: 094e3afb2fe8dfe82f63731cdcd3b999f4856cff
149 Content-length: 12 149 Content-length: 12
150 150
151 PROPS-END 151 PROPS-END
152 e 152 e
153
154
155 Node-path: branches/branch1/f
156 Node-kind: file
157 Node-action: add
158 Prop-content-length: 10
159 Text-content-length: 2
160 Text-content-md5: 9a8ad92c50cae39aa2c5604fd0ab6d8c
161 Text-content-sha1: a9fcd54b25e7e863d72cd47c08af46e61b74b561
162 Content-length: 12
163
164 PROPS-END
165 f
166
167
168 Node-path: branches/branch1/g
169 Node-kind: file
170 Node-action: add
171 Prop-content-length: 10
172 Text-content-length: 2
173 Text-content-md5: f5302386464f953ed581edac03556e55
174 Text-content-sha1: a5938ace3f424be1a26904781cdb06d55b614e6b
175 Content-length: 12
176
177 PROPS-END
178 g
153 179
154 180
155 Revision-number: 4 181 Revision-number: 4
156 Prop-content-length: 108 182 Prop-content-length: 108
157 Content-length: 108 183 Content-length: 108
165 V 7 191 V 7
166 pmezard 192 pmezard
167 K 8 193 K 8
168 svn:date 194 svn:date
169 V 27 195 V 27
170 2010-03-01T20:45:15.045695Z 196 2010-03-01T23:13:27.051018Z
171 PROPS-END 197 PROPS-END
172 198
173 Node-path: branches/branch2 199 Node-path: branches/branch2
174 Node-kind: dir 200 Node-kind: dir
175 Node-action: add 201 Node-action: add
190 V 7 216 V 7
191 pmezard 217 pmezard
192 K 8 218 K 8
193 svn:date 219 svn:date
194 V 27 220 V 27
195 2010-03-01T20:45:17.065669Z 221 2010-03-01T23:13:29.108780Z
196 PROPS-END 222 PROPS-END
197 223
198 Node-path: branches/branch2/c 224 Node-path: branches/branch2/c
199 Node-kind: file 225 Node-kind: file
200 Node-action: add 226 Node-action: add
228 254
229 PROPS-END 255 PROPS-END
230 e2 256 e2
231 257
232 258
259 Node-path: branches/branch2/f
260 Node-kind: file
261 Node-action: add
262 Prop-content-length: 10
263 Text-content-length: 3
264 Text-content-md5: 575c5638d60271457e54ab7d07309502
265 Text-content-sha1: 1c49a440c352f3473efa9512255033b94dc7def0
266 Content-length: 13
267
268 PROPS-END
269 f2
270
271
233 Revision-number: 6 272 Revision-number: 6
234 Prop-content-length: 102 273 Prop-content-length: 102
235 Content-length: 102 274 Content-length: 102
236 275
237 K 7 276 K 7
243 V 4 282 V 4
244 evil 283 evil
245 K 8 284 K 8
246 svn:date 285 svn:date
247 V 27 286 V 27
248 2010-03-01T20:45:19.243252Z 287 2010-03-01T23:13:31.520483Z
249 PROPS-END 288 PROPS-END
250 289
251 Node-path: branches/branch1 290 Node-path: branches/branch1
252 Node-kind: dir 291 Node-kind: dir
253 Node-action: delete 292 Node-action: delete
294 Node-action: add 333 Node-action: add
295 Node-copyfrom-rev: 5 334 Node-copyfrom-rev: 5
296 Node-copyfrom-path: branches/branch1/dir 335 Node-copyfrom-path: branches/branch1/dir
297 336
298 337
338 Node-path: branches/branch1/f
339 Node-kind: file
340 Node-action: delete
341
342 Node-path: branches/branch1/f
343 Node-kind: file
344 Node-action: add
345 Node-copyfrom-rev: 5
346 Node-copyfrom-path: branches/branch1/f
347 Text-copy-source-md5: 9a8ad92c50cae39aa2c5604fd0ab6d8c
348 Text-copy-source-sha1: a9fcd54b25e7e863d72cd47c08af46e61b74b561
349
350
351
352
353 Node-path: branches/branch1/g
354 Node-kind: file
355 Node-action: add
356 Node-copyfrom-rev: 5
357 Node-copyfrom-path: branches/branch1/g
358 Text-copy-source-md5: f5302386464f953ed581edac03556e55
359 Text-copy-source-sha1: a5938ace3f424be1a26904781cdb06d55b614e6b
360
361