178 | | () draft |
178 | | () draft |
179 o | 1:1b24879c5c3c added a |
179 o | 1:1b24879c5c3c added a |
180 |/ () draft |
180 |/ () draft |
181 o 0:bde1d2b6b5e5 added base |
181 o 0:bde1d2b6b5e5 added base |
182 () draft |
182 () draft |
183 |
183 $ hg log -r 'p1(.)' |
|
184 changeset: 3:9402371b436e |
|
185 parent: 0:bde1d2b6b5e5 |
|
186 user: test |
|
187 date: Thu Jan 01 00:00:00 1970 +0000 |
|
188 summary: added c and d |
|
189 |
184 $ hg up bde1d2b6b5e5 |
190 $ hg up bde1d2b6b5e5 |
185 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
191 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
186 $ echo l > l |
192 $ echo l > l |
187 $ hg ci -Aqm "added l" |
193 $ hg ci -Aqm "added l" |
188 $ hg grab -r 1b24879c5c3c |
194 $ hg grab -r 1b24879c5c3c |
277 | | () draft |
283 | | () draft |
278 | o 5:0a6281e212fe added l |
284 | o 5:0a6281e212fe added l |
279 |/ () draft |
285 |/ () draft |
280 o 0:bde1d2b6b5e5 added base |
286 o 0:bde1d2b6b5e5 added base |
281 () draft |
287 () draft |
|
288 |
|
289 Test for issue5946 present at https://bz.mercurial-scm.org/show_bug.cgi?id=5946 |
|
290 =============================================================================== |
|
291 issue with computing dependency with split and merge |
|
292 |
|
293 $ hg init issue5946 |
|
294 $ cd issue5946 |
|
295 $ echo base > base |
|
296 $ hg ci -Aqm "added base" |
|
297 |
|
298 $ echo a > a |
|
299 $ hg ci -Aqm "added a" |
|
300 |
|
301 $ echo b > b |
|
302 $ hg ci -Aqm "added b" |
|
303 |
|
304 $ hg up .^^ |
|
305 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
306 $ echo c > c |
|
307 $ echo d > d |
|
308 $ hg ci -Aqm "added c and d" |
|
309 The next line is the only difference from issue5833 above, i.e. the order of |
|
310 the parents is reversed |
|
311 $ hg co 2 |
|
312 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
313 |
|
314 $ hg merge |
|
315 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
316 (branch merge, don't forget to commit) |
|
317 $ hg ci -m "merge commit" |
|
318 |
|
319 $ hg glog |
|
320 @ 4:b9b387427a53 merge commit |
|
321 |\ () draft |
|
322 | o 3:9402371b436e added c and d |
|
323 | | () draft |
|
324 o | 2:a1da0651488c added b |
|
325 | | () draft |
|
326 o | 1:1b24879c5c3c added a |
|
327 |/ () draft |
|
328 o 0:bde1d2b6b5e5 added base |
|
329 () draft |
|
330 $ hg log -r 'p1(.)' |
|
331 changeset: 2:a1da0651488c |
|
332 user: test |
|
333 date: Thu Jan 01 00:00:00 1970 +0000 |
|
334 summary: added b |
|
335 |
|
336 $ hg up bde1d2b6b5e5 |
|
337 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
338 $ echo l > l |
|
339 $ hg ci -Aqm "added l" |
|
340 $ hg grab -r 1b24879c5c3c |
|
341 grabbing 1:1b24879c5c3c "added a" |
|
342 2 new orphan changesets |
|
343 |
|
344 $ hg up bde1d2b6b5e5 |
|
345 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
346 $ echo c > c |
|
347 $ hg ci -Aqm "added c" |
|
348 $ hg up .^ |
|
349 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
350 $ echo d > d |
|
351 $ hg ci -Aqm "added d" |
|
352 |
|
353 $ hg glog |
|
354 @ 8:5841d7cf9893 added d |
|
355 | () draft |
|
356 | o 7:62fb70414f99 added c |
|
357 |/ () draft |
|
358 | o 6:5568b87b1491 added a |
|
359 | | () draft |
|
360 | o 5:0a6281e212fe added l |
|
361 |/ () draft |
|
362 | * 4:b9b387427a53 merge commit |
|
363 | |\ () draft |
|
364 +---o 3:9402371b436e added c and d |
|
365 | | () draft |
|
366 | * 2:a1da0651488c added b |
|
367 | | () draft |
|
368 | x 1:1b24879c5c3c added a |
|
369 |/ () draft |
|
370 o 0:bde1d2b6b5e5 added base |
|
371 () draft |
|
372 |
|
373 $ hg prune -r 9402371b436e --succ 5841d7cf9893 --succ 62fb70414f99 --split |
|
374 1 changesets pruned |
|
375 |
|
376 $ hg glog |
|
377 @ 8:5841d7cf9893 added d |
|
378 | () draft |
|
379 | o 7:62fb70414f99 added c |
|
380 |/ () draft |
|
381 | o 6:5568b87b1491 added a |
|
382 | | () draft |
|
383 | o 5:0a6281e212fe added l |
|
384 |/ () draft |
|
385 | * 4:b9b387427a53 merge commit |
|
386 | |\ () draft |
|
387 +---x 3:9402371b436e added c and d |
|
388 | | () draft |
|
389 | * 2:a1da0651488c added b |
|
390 | | () draft |
|
391 | x 1:1b24879c5c3c added a |
|
392 |/ () draft |
|
393 o 0:bde1d2b6b5e5 added base |
|
394 () draft |
|
395 |
|
396 $ hg evolve --any --all --dry-run 2> error.log |
|
397 [1] |
|
398 $ tail -2 error.log |
|
399 dependencies[dependent].remove(rev) |
|
400 KeyError: 2 |