equal
deleted
inserted
replaced
392 parent: 3:725c380fe99b |
392 parent: 3:725c380fe99b |
393 add obsol_c' |
393 add obsol_c' |
394 branch: default |
394 branch: default |
395 commit: 1 deleted, 2 unknown (clean) |
395 commit: 1 deleted, 2 unknown (clean) |
396 update: 2 new changesets, 2 branch heads (merge) |
396 update: 2 new changesets, 2 branch heads (merge) |
|
397 phases: 4 draft |
397 unstable: 1 changesets |
398 unstable: 1 changesets |
398 $ qlog |
399 $ qlog |
399 6 |
400 6 |
400 - 909a0fb57e5d |
401 - 909a0fb57e5d |
401 3 |
402 3 |
667 parent: 1[46]:50f11e5e3a63 tip (re) |
668 parent: 1[46]:50f11e5e3a63 tip (re) |
668 add obsolet_conflicting_d |
669 add obsolet_conflicting_d |
669 branch: default |
670 branch: default |
670 commit: (clean) |
671 commit: (clean) |
671 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
672 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
|
673 phases: 3 draft |
672 bumped: 1 changesets |
674 bumped: 1 changesets |
673 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
675 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
674 $ hg log -r 'divergent()' |
676 $ hg log -r 'divergent()' |
675 changeset: 12:6db5e282cb91 |
677 changeset: 12:6db5e282cb91 |
676 parent: 10:2033b4e49474 |
678 parent: 10:2033b4e49474 |