equal
deleted
inserted
replaced
635 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 {'date': '', 'user': 'test'} (glob) |
635 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 {'date': '', 'user': 'test'} (glob) |
636 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 {'date': '* *', 'user': 'test'} (glob) |
636 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 {'date': '* *', 'user': 'test'} (glob) |
637 #no produced by 2.3 |
637 #no produced by 2.3 |
638 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob) |
638 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob) |
639 |
639 |
640 Check conflict detection |
640 Check divergence detection |
641 |
641 |
642 $ hg up 9468a5f5d8b2 # add obsol_d'' |
642 $ hg up 9468a5f5d8b2 # add obsol_d'' |
643 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
643 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
644 $ mkcommit "obsolet_conflicting_d" |
644 $ mkcommit "obsolet_conflicting_d" |
645 $ hg summary |
645 $ hg summary |
648 branch: default |
648 branch: default |
649 commit: (clean) |
649 commit: (clean) |
650 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
650 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
651 bumped: 1 changesets |
651 bumped: 1 changesets |
652 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
652 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
653 $ hg log -r 'conflicting()' |
653 $ hg log -r 'divergent()' |
654 changeset: 12:6db5e282cb91 |
654 changeset: 12:6db5e282cb91 |
655 parent: 10:2033b4e49474 |
655 parent: 10:2033b4e49474 |
656 user: test |
656 user: test |
657 date: Thu Jan 01 00:00:00 1970 +0000 |
657 date: Thu Jan 01 00:00:00 1970 +0000 |
658 summary: add obsol_d''' |
658 summary: add obsol_d''' |