Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 4340:5300be965515
fold: sort concatenated commit messages in topological order
It seems better to have the proposed commit message look the same
whether the user ran `hg fold --exact -r . -r .^` or `hg fold --exact
-r .^ -r .`.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 11 Jan 2019 09:26:41 -0800 |
| parents | ab3581bc0637 |
| children | 2cbb9914d227 ab5bc57ba897 2db0aca03a88 |
comparison
equal
deleted
inserted
replaced
| 4339:0f015fe4f71f | 4340:5300be965515 |
|---|---|
| 891 | 891 |
| 892 $ hg phase -r 428f7900a969 --public --hidden | 892 $ hg phase -r 428f7900a969 --public --hidden |
| 893 1 new phase-divergent changesets | 893 1 new phase-divergent changesets |
| 894 | 894 |
| 895 $ hg glog -r f3794e5a91dc:: | 895 $ hg glog -r f3794e5a91dc:: |
| 896 @ 24:e450d05b7d27 added g | 896 @ 24:390acb97e50a added f |
| 897 | () draft | 897 | () draft |
| 898 | o 23:428f7900a969 added g | 898 | o 23:428f7900a969 added g |
| 899 | | () public | 899 | | () public |
| 900 | o 22:21ae52e414e6 added f | 900 | o 22:21ae52e414e6 added f |
| 901 |/ () public | 901 |/ () public |
| 904 o 17:f3794e5a91dc added l to l | 904 o 17:f3794e5a91dc added l to l |
| 905 | () public | 905 | () public |
| 906 ~ | 906 ~ |
| 907 | 907 |
| 908 $ hg evolve --list | 908 $ hg evolve --list |
| 909 e450d05b7d27: added g | 909 390acb97e50a: added f |
| 910 phase-divergent: 21ae52e414e6 (immutable precursor) | 910 phase-divergent: 21ae52e414e6 (immutable precursor) |
| 911 phase-divergent: 428f7900a969 (immutable precursor) | 911 phase-divergent: 428f7900a969 (immutable precursor) |
| 912 | 912 |
| 913 Resolving phase divergence using `hg evolve` | 913 Resolving phase divergence using `hg evolve` |
| 914 | 914 |
| 915 $ hg evolve --phase-divergent --all | 915 $ hg evolve --phase-divergent --all |
| 916 recreate:[24] added g | 916 recreate:[24] added f |
| 917 atop:[23] added g | 917 atop:[23] added g |
| 918 rebasing to destination parent: 21ae52e414e6 | 918 rebasing to destination parent: 21ae52e414e6 |
| 919 computing new diff | 919 computing new diff |
| 920 committed as 428f7900a969 | 920 committed as 428f7900a969 |
| 921 working directory is now at 428f7900a969 | 921 working directory is now at 428f7900a969 |