Mercurial > evolve

comparison tests/test-evolve-phase-divergence.t @ 5301:e8660b28bfee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obslog: makes --origin flag the default Test change have been carefully validated.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 07 May 2020 01:29:48 +0200
parents 417503ef667d
children 30a924abda75
comparison
equal deleted inserted replaced
5300:a9f9edb168a1 5301:e8660b28bfee
158 ------------------------------------------ 158 ------------------------------------------
159 159
160 XXX: There must be mention of phase-divergence here 160 XXX: There must be mention of phase-divergence here
161 $ hg obslog -r . --all 161 $ hg obslog -r . --all
162 @ 98bb3a6cfe1a (2) tweak a 162 @ 98bb3a6cfe1a (2) tweak a
163 | reworded(description) from 4d1169d82e47 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
163 | 164 |
164 o 4d1169d82e47 (1) modify a 165 o 4d1169d82e47 (1) modify a
165 reworded(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
166 166
167 Solving the phase divergence using evolve command 167 Solving the phase divergence using evolve command
168 -------------------------------------------------- 168 --------------------------------------------------
169 169
170 (We do not solve evolution other than orphan by default because it turned out 170 (We do not solve evolution other than orphan by default because it turned out
357 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 {d3873e73d99ef67873dac33fbcc66268d5d2b6f4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} 357 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 {d3873e73d99ef67873dac33fbcc66268d5d2b6f4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
358 aa071e5554e36080a36cfd24accd5a71e3320f1e d47f2b37ed8216234c503b3a2657989958754a59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 358 aa071e5554e36080a36cfd24accd5a71e3320f1e d47f2b37ed8216234c503b3a2657989958754a59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
359 d47f2b37ed8216234c503b3a2657989958754a59 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 359 d47f2b37ed8216234c503b3a2657989958754a59 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
360 $ hg obslog -r . --all 360 $ hg obslog -r . --all
361 @ 3d62500c673d (5) phase-divergent update to aa071e5554e3: 361 @ 3d62500c673d (5) phase-divergent update to aa071e5554e3:
362 | rewritten(description, parent, content) from d47f2b37ed82 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
362 | 363 |
363 % d47f2b37ed82 (4) added bar to foo 364 % d47f2b37ed82 (4) added bar to foo
364 | rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 365 | rewritten(description, content) from aa071e5554e3 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
365 | 366 |
366 % aa071e5554e3 (3) added foo to foo 367 % aa071e5554e3 (3) added foo to foo
367 rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
368 368
369 369
370 Syncing all other repositories 370 Syncing all other repositories
371 ------------------------------ 371 ------------------------------
372 372
595 b756eb10ea73ee4ba69c998e64a5c6e1005d74b5 2c3560aedeadb452d517b6c5a93fd3af91b3b8cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 595 b756eb10ea73ee4ba69c998e64a5c6e1005d74b5 2c3560aedeadb452d517b6c5a93fd3af91b3b8cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
596 2c3560aedeadb452d517b6c5a93fd3af91b3b8cd 502e737366322886cf628276aa0a2796904453b4 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 596 2c3560aedeadb452d517b6c5a93fd3af91b3b8cd 502e737366322886cf628276aa0a2796904453b4 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
597 2352021b37851be226ebed109b0eb6eada918566 334e300d6db500489d842240cbdc40c203d385c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 597 2352021b37851be226ebed109b0eb6eada918566 334e300d6db500489d842240cbdc40c203d385c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
598 $ hg obslog -r . 598 $ hg obslog -r .
599 @ 334e300d6db5 (10) added x to x 599 @ 334e300d6db5 (10) added x to x
600 | rebased(parent) from 2352021b3785 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
600 | 601 |
601 o 2352021b3785 (9) added x to x 602 o 2352021b3785 (9) added x to x
602 rebased(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
603 603
604 $ hg glog -r .^:: 604 $ hg glog -r .^::
605 @ 10:334e300d6db5 added x to x 605 @ 10:334e300d6db5 added x to x
606 | (bm) draft 606 | (bm) draft
607 | o 9:2352021b3785 added x to x 607 | o 9:2352021b3785 added x to x
652 2352021b37851be226ebed109b0eb6eada918566 334e300d6db500489d842240cbdc40c203d385c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 652 2352021b37851be226ebed109b0eb6eada918566 334e300d6db500489d842240cbdc40c203d385c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
653 334e300d6db500489d842240cbdc40c203d385c7 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 653 334e300d6db500489d842240cbdc40c203d385c7 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
654 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 {502e737366322886cf628276aa0a2796904453b4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} 654 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 {502e737366322886cf628276aa0a2796904453b4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
655 $ hg obslog -r . b1a0e143e32b --all --hidden 655 $ hg obslog -r . b1a0e143e32b --all --hidden
656 x b1a0e143e32b (11) added x to x 656 x b1a0e143e32b (11) added x to x
657 | rebased(parent) from 334e300d6db5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
657 | pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 658 | pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
658 | 659 |
659 x 334e300d6db5 (10) added x to x 660 x 334e300d6db5 (10) added x to x
660 | rebased(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 661 | rebased(parent) from 2352021b3785 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
661 | 662 |
662 @ 2352021b3785 (9) added x to x 663 @ 2352021b3785 (9) added x to x
663 rebased(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
664 664
665 665
666 $ hg exp 666 $ hg exp
667 # HG changeset patch 667 # HG changeset patch
668 # User test 668 # User test
748 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 {502e737366322886cf628276aa0a2796904453b4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} 748 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 {502e737366322886cf628276aa0a2796904453b4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
749 dc88f5aa9bc90a6418899d267d9524205dfb429b 211ab84d1689507465ecf708fea540e9867d5fda 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 749 dc88f5aa9bc90a6418899d267d9524205dfb429b 211ab84d1689507465ecf708fea540e9867d5fda 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
750 211ab84d1689507465ecf708fea540e9867d5fda 13015a180eee523ba9950f18683762a77f560f3d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 750 211ab84d1689507465ecf708fea540e9867d5fda 13015a180eee523ba9950f18683762a77f560f3d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
751 $ hg obslog -r . 751 $ hg obslog -r .
752 @ 13015a180eee (14) y to y and foobar to foo 752 @ 13015a180eee (14) y to y and foobar to foo
753 | amended(content) from 211ab84d1689 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
753 | 754 |
754 x 211ab84d1689 (13) y to y and foobar to foo 755 x 211ab84d1689 (13) y to y and foobar to foo
755 | amended(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000) 756 | rebased(parent) from dc88f5aa9bc9 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
756 | 757 |
757 o dc88f5aa9bc9 (12) y to y and foobar to foo 758 o dc88f5aa9bc9 (12) y to y and foobar to foo
758 rebased(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
759 759
760 Resolving divergence using `hg evolve` 760 Resolving divergence using `hg evolve`
761 ------------------------------------- 761 -------------------------------------
762 762
763 $ hg evolve --phase-divergent --update 763 $ hg evolve --phase-divergent --update
836 7687d2968b3e2697f955beac2da24ee879950cb9 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 836 7687d2968b3e2697f955beac2da24ee879950cb9 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
837 f3794e5a91dc1d4d36fee5c423386b19433a1f48 2bfd56949cf0a3abfbf9881254a88fe07b336ddb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 837 f3794e5a91dc1d4d36fee5c423386b19433a1f48 2bfd56949cf0a3abfbf9881254a88fe07b336ddb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
838 2bfd56949cf0a3abfbf9881254a88fe07b336ddb 5fd38c0de46ec31f0bb1904b5909802bc4bcb47e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 838 2bfd56949cf0a3abfbf9881254a88fe07b336ddb 5fd38c0de46ec31f0bb1904b5909802bc4bcb47e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
839 $ hg obslog -r . 839 $ hg obslog -r .
840 @ 5fd38c0de46e (19) added l to l 840 @ 5fd38c0de46e (19) added l to l
841 | amended(content) from 2bfd56949cf0 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
841 | 842 |
842 x 2bfd56949cf0 (18) added l to l 843 x 2bfd56949cf0 (18) added l to l
843 | amended(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000) 844 | rebased(parent) from f3794e5a91dc using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
844 | 845 |
845 x f3794e5a91dc (17) added l to l 846 x f3794e5a91dc (17) added l to l
846 rebased(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
847 847
848 848
849 $ hg phase -r f3794e5a91dc --public --hidden 849 $ hg phase -r f3794e5a91dc --public --hidden
850 1 new phase-divergent changesets 850 1 new phase-divergent changesets
851 851
1077 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 86419909e01787959aa6471aee605c6d604a3e0d 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 1077 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 86419909e01787959aa6471aee605c6d604a3e0d 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
1078 e1154ec0206ac05c3765f7bd1337e3b96db2974f ee4af146c5cfe0b1bf7665243dd89f9bfe604f59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 1078 e1154ec0206ac05c3765f7bd1337e3b96db2974f ee4af146c5cfe0b1bf7665243dd89f9bfe604f59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
1079 ee4af146c5cfe0b1bf7665243dd89f9bfe604f59 89ba615ea1ec3ba5b25db9f7897eb29712d7e5d6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 1079 ee4af146c5cfe0b1bf7665243dd89f9bfe604f59 89ba615ea1ec3ba5b25db9f7897eb29712d7e5d6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
1080 $ hg obslog -r a51bce62c219 --all 1080 $ hg obslog -r a51bce62c219 --all
1081 o 86419909e017 (4) phase-divergent update to a51bce62c219: 1081 o 86419909e017 (4) phase-divergent update to a51bce62c219:
1082 | rewritten(description, parent, content) from 4f25cd9cd2bf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1082 | 1083 |
1083 | @ 89ba615ea1ec (6) phase-divergent update to a51bce62c219: 1084 | @ 89ba615ea1ec (6) phase-divergent update to a51bce62c219:
1085 | | rewritten(description, parent, content) from ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1084 | | 1086 | |
1085 x | 4f25cd9cd2bf (2) added m 1087 x | 4f25cd9cd2bf (2) added m
1086 | | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1088 | | split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1087 | | 1089 | |
1088 | x ee4af146c5cf (5) added n 1090 | x ee4af146c5cf (5) added n
1089 | | rewritten(description, parent, content) as 89ba615ea1ec using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1091 | | rebased(parent) from e1154ec0206a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1090 | | 1092 | |
1091 | x e1154ec0206a (3) added n 1093 | x e1154ec0206a (3) added n
1092 |/ rebased(parent) as ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1094 |/ split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1093 | 1095 |
1094 o a51bce62c219 (1) added m and n 1096 o a51bce62c219 (1) added m and n
1095 split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1096 1097
1097 1098
1098 XXX: not sure this is the correct 1099 XXX: not sure this is the correct
1099 $ hg exp 89ba615ea1ec 1100 $ hg exp 89ba615ea1ec
1100 # HG changeset patch 1101 # HG changeset patch
1211 90859808ece64c9ca64dd29992db42353c70f164 a472632947451d2e52659aec3088c98ddf920f2b bb87595f9a77d7d1e4a8726beef266a1636f63d5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} 1212 90859808ece64c9ca64dd29992db42353c70f164 a472632947451d2e52659aec3088c98ddf920f2b bb87595f9a77d7d1e4a8726beef266a1636f63d5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
1212 a472632947451d2e52659aec3088c98ddf920f2b 25875a9cb6400973b846c94f6a80410067c2cb1f 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 1213 a472632947451d2e52659aec3088c98ddf920f2b 25875a9cb6400973b846c94f6a80410067c2cb1f 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
1213 bb87595f9a77d7d1e4a8726beef266a1636f63d5 26f564f94bcc34e049eb112fd14ab1e5286f2325 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 1214 bb87595f9a77d7d1e4a8726beef266a1636f63d5 26f564f94bcc34e049eb112fd14ab1e5286f2325 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
1214 $ hg obslog -r 90859808ece6 --all 1215 $ hg obslog -r 90859808ece6 --all
1215 o 25875a9cb640 (4) phase-divergent update to 90859808ece6: 1216 o 25875a9cb640 (4) phase-divergent update to 90859808ece6:
1217 | rewritten(description, parent, content) from a47263294745 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1216 | 1218 |
1217 | @ 26f564f94bcc (5) phase-divergent update to 90859808ece6: 1219 | @ 26f564f94bcc (5) phase-divergent update to 90859808ece6:
1220 | | rewritten(description, parent, content) from bb87595f9a77 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1218 | | 1221 | |
1219 x | a47263294745 (2) added p 1222 x | a47263294745 (2) added p
1220 | | rewritten(description, parent, content) as 25875a9cb640 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1223 | | split(description, content) from 90859808ece6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1221 | | 1224 | |
1222 | x bb87595f9a77 (3) added q 1225 | x bb87595f9a77 (3) added q
1223 |/ rewritten(description, parent, content) as 26f564f94bcc using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1226 |/ split(description, content) from 90859808ece6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1224 | 1227 |
1225 o 90859808ece6 (1) added p and q 1228 o 90859808ece6 (1) added p and q
1226 split(description, content) as a47263294745, bb87595f9a77 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1227 1229
1228 1230
1229 XXX: not sure this is correct 1231 XXX: not sure this is correct
1230 $ hg exp 26f564f94bcc 1232 $ hg exp 26f564f94bcc
1231 # HG changeset patch 1233 # HG changeset patch
1348 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 86419909e01787959aa6471aee605c6d604a3e0d 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 1350 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 86419909e01787959aa6471aee605c6d604a3e0d 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
1349 52ca78bb98c71222f8afae28d48ae6cfd44a60c9 98dad881251146cd171f53b2a5b7fc3a371f820e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 1351 52ca78bb98c71222f8afae28d48ae6cfd44a60c9 98dad881251146cd171f53b2a5b7fc3a371f820e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
1350 98dad881251146cd171f53b2a5b7fc3a371f820e 88b0dae5369aaa3bceb6c0b647542594e2c72fb7 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 1352 98dad881251146cd171f53b2a5b7fc3a371f820e 88b0dae5369aaa3bceb6c0b647542594e2c72fb7 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
1351 $ hg obslog -r a51bce62c219 --all 1353 $ hg obslog -r a51bce62c219 --all
1352 o 86419909e017 (5) phase-divergent update to a51bce62c219: 1354 o 86419909e017 (5) phase-divergent update to a51bce62c219:
1355 | rewritten(description, parent, content) from 4f25cd9cd2bf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1353 | 1356 |
1354 | @ 88b0dae5369a (7) phase-divergent update to a51bce62c219: 1357 | @ 88b0dae5369a (7) phase-divergent update to a51bce62c219:
1358 | | rewritten(description, parent, content) from 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1355 | | 1359 | |
1356 x | 4f25cd9cd2bf (2) added m 1360 x | 4f25cd9cd2bf (2) added m
1357 | | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1361 | | split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1358 | | 1362 | |
1359 | % 98dad8812511 (6) added n 1363 | % 98dad8812511 (6) added n
1360 | | rewritten(description, parent, content) as 88b0dae5369a using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1364 | | rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1361 | | 1365 | |
1362 | x 52ca78bb98c7 (4) added n 1366 | x 52ca78bb98c7 (4) added n
1363 | | rebased(parent) as 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1367 | | amended(content) from e1154ec0206a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1364 | | 1368 | |
1365 | x e1154ec0206a (3) added n 1369 | x e1154ec0206a (3) added n
1366 |/ amended(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1370 |/ split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1367 | 1371 |
1368 % a51bce62c219 (1) added m and n 1372 % a51bce62c219 (1) added m and n
1369 split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1370 1373
1371 1374
1372 XXX: not sure this is correct 1375 XXX: not sure this is correct
1373 $ hg exp 86419909e017 1376 $ hg exp 86419909e017
1374 # HG changeset patch 1377 # HG changeset patch
1647 1650
1648 $ hg debugobsolete 1651 $ hg debugobsolete
1649 3074c7249d2023b1fff891591d7e609695cd09c2 59945437088136c5fa2f9bb8573d5d02623fe7cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 1652 3074c7249d2023b1fff891591d7e609695cd09c2 59945437088136c5fa2f9bb8573d5d02623fe7cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
1650 $ hg obslog --all --patch 1653 $ hg obslog --all --patch
1651 @ 599454370881 (2) E2 1654 @ 599454370881 (2) E2
1655 | rewritten(description, content) from 3074c7249d20 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1656 | diff -r 3074c7249d20 -r 599454370881 changeset-description
1657 | --- a/changeset-description
1658 | +++ b/changeset-description
1659 | @@ -1,1 +1,1 @@
1660 | -E1
1661 | +E2
1662 |
1663 | diff -r 3074c7249d20 -r 599454370881 letters
1664 | --- a/letters Thu Jan 01 00:00:00 1970 +0000
1665 | +++ b/letters Thu Jan 01 00:00:00 1970 +0000
1666 | @@ -1,7 +1,7 @@
1667 | a
1668 | b
1669 | c
1670 | -D
1671 | +d
1672 | e
1673 | f
1674 | g
1675 | diff -r 3074c7249d20 -r 599454370881 numbers
1676 | --- a/numbers Thu Jan 01 00:00:00 1970 +0000
1677 | +++ b/numbers Thu Jan 01 00:00:00 1970 +0000
1678 | @@ -1,9 +1,9 @@
1679 | 1
1680 | 2
1681 | 3
1682 | -four
1683 | +4
1684 | 5
1685 | 6
1686 | -7
1687 | +seven
1688 | 8
1689 | nine
1690 | diff -r 3074c7249d20 -r 599454370881 romans
1691 | --- a/romans Thu Jan 01 00:00:00 1970 +0000
1692 | +++ b/romans Thu Jan 01 00:00:00 1970 +0000
1693 | @@ -1,5 +1,5 @@
1694 | I
1695 | -II
1696 | +ii
1697 | III
1698 | IV
1699 | V
1700 |
1652 | 1701 |
1653 o 3074c7249d20 (1) E1 1702 o 3074c7249d20 (1) E1
1654 rewritten(description, content) as 599454370881 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1655 diff -r 3074c7249d20 -r 599454370881 changeset-description
1656 --- a/changeset-description
1657 +++ b/changeset-description
1658 @@ -1,1 +1,1 @@
1659 -E1
1660 +E2
1661
1662 diff -r 3074c7249d20 -r 599454370881 letters
1663 --- a/letters Thu Jan 01 00:00:00 1970 +0000
1664 +++ b/letters Thu Jan 01 00:00:00 1970 +0000
1665 @@ -1,7 +1,7 @@
1666 a
1667 b
1668 c
1669 -D
1670 +d
1671 e
1672 f
1673 g
1674 diff -r 3074c7249d20 -r 599454370881 numbers
1675 --- a/numbers Thu Jan 01 00:00:00 1970 +0000
1676 +++ b/numbers Thu Jan 01 00:00:00 1970 +0000
1677 @@ -1,9 +1,9 @@
1678 1
1679 2
1680 3
1681 -four
1682 +4
1683 5
1684 6
1685 -7
1686 +seven
1687 8
1688 nine
1689 diff -r 3074c7249d20 -r 599454370881 romans
1690 --- a/romans Thu Jan 01 00:00:00 1970 +0000
1691 +++ b/romans Thu Jan 01 00:00:00 1970 +0000
1692 @@ -1,5 +1,5 @@
1693 I
1694 -II
1695 +ii
1696 III
1697 IV
1698 V
1699
1700 1703
1701 1704
1702 $ hg evolve --phase-divergent --rev 'desc("E2")' 1705 $ hg evolve --phase-divergent --rev 'desc("E2")'
1703 recreate:[2] E2 1706 recreate:[2] E2
1704 atop:[1] E1 1707 atop:[1] E1
1834 $ hg debugobsolete 1837 $ hg debugobsolete
1835 3074c7249d2023b1fff891591d7e609695cd09c2 59945437088136c5fa2f9bb8573d5d02623fe7cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 1838 3074c7249d2023b1fff891591d7e609695cd09c2 59945437088136c5fa2f9bb8573d5d02623fe7cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
1836 59945437088136c5fa2f9bb8573d5d02623fe7cb 9eebcb77a7e2b240cb7dce095bbe608b5de91cc8 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 1839 59945437088136c5fa2f9bb8573d5d02623fe7cb 9eebcb77a7e2b240cb7dce095bbe608b5de91cc8 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
1837 $ hg obslog --patch 1840 $ hg obslog --patch
1838 @ 9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20: 1841 @ 9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20:
1842 | rewritten(description, parent, content) from 599454370881 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1843 | (No patch available, changesets rebased)
1839 | 1844 |
1840 % 599454370881 (2) E2 1845 % 599454370881 (2) E2
1841 | rewritten(description, parent, content) as 9eebcb77a7e2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1846 | rewritten(description, content) from 3074c7249d20 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1842 | (No patch available, changesets rebased) 1847 | diff -r 3074c7249d20 -r 599454370881 changeset-description
1848 | --- a/changeset-description
1849 | +++ b/changeset-description
1850 | @@ -1,1 +1,1 @@
1851 | -E1
1852 | +E2
1853 |
1854 | diff -r 3074c7249d20 -r 599454370881 letters
1855 | --- a/letters Thu Jan 01 00:00:00 1970 +0000
1856 | +++ b/letters Thu Jan 01 00:00:00 1970 +0000
1857 | @@ -1,7 +1,7 @@
1858 | a
1859 | b
1860 | c
1861 | -D
1862 | +d
1863 | e
1864 | f
1865 | g
1866 | diff -r 3074c7249d20 -r 599454370881 numbers
1867 | --- a/numbers Thu Jan 01 00:00:00 1970 +0000
1868 | +++ b/numbers Thu Jan 01 00:00:00 1970 +0000
1869 | @@ -1,9 +1,9 @@
1870 | 1
1871 | 2
1872 | 3
1873 | -four
1874 | +4
1875 | 5
1876 | 6
1877 | -7
1878 | +seven
1879 | 8
1880 | nine
1881 | diff -r 3074c7249d20 -r 599454370881 romans
1882 | --- a/romans Thu Jan 01 00:00:00 1970 +0000
1883 | +++ b/romans Thu Jan 01 00:00:00 1970 +0000
1884 | @@ -1,5 +1,5 @@
1885 | I
1886 | -II
1887 | +ii
1888 | III
1889 | IV
1890 | V
1891 |
1843 | 1892 |
1844 % 3074c7249d20 (1) E1 1893 % 3074c7249d20 (1) E1
1845 rewritten(description, content) as 599454370881 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1846 diff -r 3074c7249d20 -r 599454370881 changeset-description
1847 --- a/changeset-description
1848 +++ b/changeset-description
1849 @@ -1,1 +1,1 @@
1850 -E1
1851 +E2
1852
1853 diff -r 3074c7249d20 -r 599454370881 letters
1854 --- a/letters Thu Jan 01 00:00:00 1970 +0000
1855 +++ b/letters Thu Jan 01 00:00:00 1970 +0000
1856 @@ -1,7 +1,7 @@
1857 a
1858 b
1859 c
1860 -D
1861 +d
1862 e
1863 f
1864 g
1865 diff -r 3074c7249d20 -r 599454370881 numbers
1866 --- a/numbers Thu Jan 01 00:00:00 1970 +0000
1867 +++ b/numbers Thu Jan 01 00:00:00 1970 +0000
1868 @@ -1,9 +1,9 @@
1869 1
1870 2
1871 3
1872 -four
1873 +4
1874 5
1875 6
1876 -7
1877 +seven
1878 8
1879 nine
1880 diff -r 3074c7249d20 -r 599454370881 romans
1881 --- a/romans Thu Jan 01 00:00:00 1970 +0000
1882 +++ b/romans Thu Jan 01 00:00:00 1970 +0000
1883 @@ -1,5 +1,5 @@
1884 I
1885 -II
1886 +ii
1887 III
1888 IV
1889 V
1890
1891 1894
1892 $ cd .. 1895 $ cd ..
1893 1896
1894 Phase divergence with file removal cancelation 1897 Phase divergence with file removal cancelation
1895 ============================================== 1898 ==============================================