Mercurial > evolve

comparison tests/test-evolve-phase-divergence.t @ 4454:f530850c8184

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: drop the "computing new diff message" for phase-divergence Future code update will remove this message, dropping it early clarify the future diff.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 26 Mar 2019 12:30:10 +0100
parents 700b8b3a5a54
children b58e45aa9be2
comparison
equal deleted inserted replaced
4453:700b8b3a5a54 4454:f530850c8184
194 of public one. From the message it looks like a new commit is created. 194 of public one. From the message it looks like a new commit is created.
195 195
196 $ hg evolve --phase-divergent 196 $ hg evolve --phase-divergent
197 recreate:[2] tweak a 197 recreate:[2] tweak a
198 atop:[1] modify a 198 atop:[1] modify a
199 computing new diff
200 no changes to commit 199 no changes to commit
201 working directory is now at 4d1169d82e47 200 working directory is now at 4d1169d82e47
202 201
203 $ hg glog 202 $ hg glog
204 @ 1:4d1169d82e47 modify a 203 @ 1:4d1169d82e47 modify a
309 test I have to go through code base to understand what will be the behavior 308 test I have to go through code base to understand what will be the behavior
310 309
311 $ hg evolve --phase-divergent 310 $ hg evolve --phase-divergent
312 recreate:[4] added bar to foo 311 recreate:[4] added bar to foo
313 atop:[3] added foo to foo 312 atop:[3] added foo to foo
314 computing new diff
315 committed as 3d62500c673d 313 committed as 3d62500c673d
316 working directory is now at 3d62500c673d 314 working directory is now at 3d62500c673d
317 315
318 $ hg exp 316 $ hg exp
319 # HG changeset patch 317 # HG changeset patch
460 --------------------------------------------------------------- 458 ---------------------------------------------------------------
461 459
462 $ hg evolve --phase-divergent 460 $ hg evolve --phase-divergent
463 recreate:[7] foo to bar 461 recreate:[7] foo to bar
464 atop:[6] added bar to bar 462 atop:[6] added bar to bar
465 computing new diff
466 committed as 502e73736632 463 committed as 502e73736632
467 working directory is now at 502e73736632 464 working directory is now at 502e73736632
468 465
469 $ hg exp 466 $ hg exp
470 # HG changeset patch 467 # HG changeset patch
597 $ hg evolve --phase-divergent 594 $ hg evolve --phase-divergent
598 recreate:[10] added x to x 595 recreate:[10] added x to x
599 atop:[9] added x to x 596 atop:[9] added x to x
600 rebasing to destination parent: 502e73736632 597 rebasing to destination parent: 502e73736632
601 (leaving bookmark bm) 598 (leaving bookmark bm)
602 computing new diff
603 no changes to commit 599 no changes to commit
604 working directory is now at 2352021b3785 600 working directory is now at 2352021b3785
605 601
606 XXX: we should move bookmark here 602 XXX: we should move bookmark here
607 $ hg glog 603 $ hg glog
716 712
717 $ hg evolve --phase-divergent 713 $ hg evolve --phase-divergent
718 recreate:[14] y to y and foobar to foo 714 recreate:[14] y to y and foobar to foo
719 atop:[12] y to y and foobar to foo 715 atop:[12] y to y and foobar to foo
720 rebasing to destination parent: 2352021b3785 716 rebasing to destination parent: 2352021b3785
721 computing new diff
722 committed as 8c2bb6fb44e9 717 committed as 8c2bb6fb44e9
723 working directory is now at 8c2bb6fb44e9 718 working directory is now at 8c2bb6fb44e9
724 719
725 $ hg exp 720 $ hg exp
726 # HG changeset patch 721 # HG changeset patch
820 (no more unresolved files) 815 (no more unresolved files)
821 continue: hg evolve --continue 816 continue: hg evolve --continue
822 817
823 $ hg evolve --continue 818 $ hg evolve --continue
824 evolving 19:5fd38c0de46e "added l to l" 819 evolving 19:5fd38c0de46e "added l to l"
825 computing new diff
826 committed as e3090241a10c 820 committed as e3090241a10c
827 working directory is now at e3090241a10c 821 working directory is now at e3090241a10c
828 822
829 $ hg glog 823 $ hg glog
830 @ 21:e3090241a10c phase-divergent update to f3794e5a91dc: 824 @ 21:e3090241a10c phase-divergent update to f3794e5a91dc:
917 911
918 $ hg evolve --phase-divergent --all 912 $ hg evolve --phase-divergent --all
919 recreate:[24] added f 913 recreate:[24] added f
920 atop:[23] added g 914 atop:[23] added g
921 rebasing to destination parent: 21ae52e414e6 915 rebasing to destination parent: 21ae52e414e6
922 computing new diff
923 no changes to commit 916 no changes to commit
924 working directory is now at 428f7900a969 917 working directory is now at 428f7900a969
925 918
926 $ hg glog -r f3794e5a91dc:: 919 $ hg glog -r f3794e5a91dc::
927 @ 23:428f7900a969 added g 920 @ 23:428f7900a969 added g
984 () public 977 () public
985 978
986 $ hg evolve --all --phase-divergent 979 $ hg evolve --all --phase-divergent
987 recreate:[2] added m 980 recreate:[2] added m
988 atop:[1] added m and n 981 atop:[1] added m and n
989 computing new diff
990 committed as 86419909e017 982 committed as 86419909e017
991 1 new orphan changesets 983 1 new orphan changesets
992 recreate:[3] added n 984 recreate:[3] added n
993 atop:[1] added m and n 985 atop:[1] added m and n
994 rebasing to destination parent: d3873e73d99e 986 rebasing to destination parent: d3873e73d99e
995 computing new diff
996 committed as 89ba615ea1ec 987 committed as 89ba615ea1ec
997 working directory is now at 89ba615ea1ec 988 working directory is now at 89ba615ea1ec
998 989
999 XXX: this is messy, we should solve things in better way 990 XXX: this is messy, we should solve things in better way
1000 $ hg glog --hidden 991 $ hg glog --hidden
1103 phase-divergent: 90859808ece6 (immutable precursor) 1094 phase-divergent: 90859808ece6 (immutable precursor)
1104 1095
1105 $ hg evolve --all --phase-divergent 1096 $ hg evolve --all --phase-divergent
1106 recreate:[2] added p 1097 recreate:[2] added p
1107 atop:[1] added p and q 1098 atop:[1] added p and q
1108 computing new diff
1109 committed as 25875a9cb640 1099 committed as 25875a9cb640
1110 recreate:[3] added q 1100 recreate:[3] added q
1111 atop:[1] added p and q 1101 atop:[1] added p and q
1112 computing new diff
1113 committed as 26f564f94bcc 1102 committed as 26f564f94bcc
1114 working directory is now at 26f564f94bcc 1103 working directory is now at 26f564f94bcc
1115 1104
1116 $ hg glog --hidden 1105 $ hg glog --hidden
1117 @ 5:26f564f94bcc phase-divergent update to 90859808ece6: 1106 @ 5:26f564f94bcc phase-divergent update to 90859808ece6: