equal
deleted
inserted
replaced
642 commit: (clean) |
642 commit: (clean) |
643 update: (9|11) new changesets, (9|10) branch heads \(merge\) (re) |
643 update: (9|11) new changesets, (9|10) branch heads \(merge\) (re) |
644 latecomer: 1 changesets |
644 latecomer: 1 changesets |
645 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
645 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
646 $ hg log -r 'conflicting()' |
646 $ hg log -r 'conflicting()' |
647 changeset: 1[46]:50f11e5e3a63 (re) |
647 changeset: 12:6db5e282cb91 |
|
648 parent: 10:2033b4e49474 |
|
649 user: test |
|
650 date: Thu Jan 01 00:00:00 1970 +0000 |
|
651 summary: add obsol_d''' |
|
652 |
|
653 changeset: 14:50f11e5e3a63 |
648 tag: tip |
654 tag: tip |
649 parent: 11:9468a5f5d8b2 |
655 parent: 11:9468a5f5d8b2 |
650 user: test |
656 user: test |
651 date: Thu Jan 01 00:00:00 1970 +0000 |
657 date: Thu Jan 01 00:00:00 1970 +0000 |
652 summary: add obsolet_conflicting_d |
658 summary: add obsolet_conflicting_d |