Mercurial > evolve
diff 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 |
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t Wed Dec 26 14:52:07 2018 +0800 +++ b/tests/test-evolve-phase-divergence.t Fri Jan 11 09:26:41 2019 -0800 @@ -893,7 +893,7 @@ 1 new phase-divergent changesets $ hg glog -r f3794e5a91dc:: - @ 24:e450d05b7d27 added g + @ 24:390acb97e50a added f | () draft | o 23:428f7900a969 added g | | () public @@ -906,14 +906,14 @@ ~ $ hg evolve --list - e450d05b7d27: added g + 390acb97e50a: added f phase-divergent: 21ae52e414e6 (immutable precursor) phase-divergent: 428f7900a969 (immutable precursor) Resolving phase divergence using `hg evolve` $ hg evolve --phase-divergent --all - recreate:[24] added g + recreate:[24] added f atop:[23] added g rebasing to destination parent: 21ae52e414e6 computing new diff