162 abort: empty revision set |
162 abort: empty revision set |
163 [255] |
163 [255] |
164 $ hg push ../other-new |
164 $ hg push ../other-new |
165 pushing to ../other-new |
165 pushing to ../other-new |
166 searching for changes |
166 searching for changes |
167 abort: push includes an unstable changeset: a7a6f2b5d8a5! |
167 abort: push includes unstable changeset: a7a6f2b5d8a5! |
168 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
168 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
169 [255] |
169 [255] |
170 $ hg push -f ../other-new |
170 $ hg push -f ../other-new |
171 pushing to ../other-new |
171 pushing to ../other-new |
172 searching for changes |
172 searching for changes |
215 3 |
215 3 |
216 - 0d3f46688ccc |
216 - 0d3f46688ccc |
217 $ hg push ../other-new |
217 $ hg push ../other-new |
218 pushing to ../other-new |
218 pushing to ../other-new |
219 searching for changes |
219 searching for changes |
220 abort: push includes an unstable changeset: 95de7fc6918d! |
220 abort: push includes unstable changeset: 95de7fc6918d! |
221 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
221 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
222 [255] |
222 [255] |
223 $ hg push ../other-new -f # use f because there is unstability |
223 $ hg push ../other-new -f # use f because there is unstability |
224 pushing to ../other-new |
224 pushing to ../other-new |
225 searching for changes |
225 searching for changes |
560 summary: add obsol_d''' |
560 summary: add obsol_d''' |
561 |
561 |
562 $ hg push ../other-new/ |
562 $ hg push ../other-new/ |
563 pushing to ../other-new/ |
563 pushing to ../other-new/ |
564 searching for changes |
564 searching for changes |
565 abort: push includes a latecomer changeset: 6db5e282cb91! |
565 abort: push includes bumped changeset: 6db5e282cb91! |
566 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
566 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
567 [255] |
567 [255] |
568 |
568 |
569 Check hg commit --amend compat |
569 Check hg commit --amend compat |
570 |
570 |
624 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob) |
624 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob) |
625 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob) |
625 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob) |
626 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 {'date': '* *', 'user': 'test'} (glob) |
626 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 {'date': '* *', 'user': 'test'} (glob) |
627 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 {'date': '* *', 'user': 'test'} (glob) |
627 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 {'date': '* *', 'user': 'test'} (glob) |
628 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 {'date': '', 'user': 'test'} (glob) |
628 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 {'date': '', 'user': 'test'} (glob) |
629 0b1b6dd009c037985363e2290a0b579819f659db 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob) |
629 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 {'date': '* *', 'user': 'test'} (glob) |
630 #no produced by 2.3 |
630 #no produced by 2.3 |
631 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob) |
631 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob) |
632 |
632 |
633 Check conflict detection |
633 Check conflict detection |
634 |
634 |
648 parent: 10:2033b4e49474 |
648 parent: 10:2033b4e49474 |
649 user: test |
649 user: test |
650 date: Thu Jan 01 00:00:00 1970 +0000 |
650 date: Thu Jan 01 00:00:00 1970 +0000 |
651 summary: add obsol_d''' |
651 summary: add obsol_d''' |
652 |
652 |
653 changeset: 14:50f11e5e3a63 |
653 changeset: 16:50f11e5e3a63 |
654 tag: tip |
654 tag: tip |
655 parent: 11:9468a5f5d8b2 |
655 parent: 11:9468a5f5d8b2 |
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 obsolet_conflicting_d |
658 summary: add obsolet_conflicting_d |