Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 4360:522abf1d70b7 mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:54:44 -0500 |
| parents | 2a7f89817540 2cbb9914d227 |
| children | a2fdbece7ce1 d70db7e455dc |
comparison
equal
deleted
inserted
replaced
| 4313:4a740f9eee49 | 4360:522abf1d70b7 |
|---|---|
| 886 | 886 |
| 887 $ hg phase -r 428f7900a969 --public --hidden | 887 $ hg phase -r 428f7900a969 --public --hidden |
| 888 1 new phase-divergent changesets | 888 1 new phase-divergent changesets |
| 889 | 889 |
| 890 $ hg glog -r f3794e5a91dc:: | 890 $ hg glog -r f3794e5a91dc:: |
| 891 @ 24:e450d05b7d27 added g | 891 @ 24:390acb97e50a added f |
| 892 | () draft | 892 | () draft |
| 893 | o 23:428f7900a969 added g | 893 | o 23:428f7900a969 added g |
| 894 | | () public | 894 | | () public |
| 895 | o 22:21ae52e414e6 added f | 895 | o 22:21ae52e414e6 added f |
| 896 |/ () public | 896 |/ () public |
| 899 o 17:f3794e5a91dc added l to l | 899 o 17:f3794e5a91dc added l to l |
| 900 | () public | 900 | () public |
| 901 ~ | 901 ~ |
| 902 | 902 |
| 903 $ hg evolve --list | 903 $ hg evolve --list |
| 904 e450d05b7d27: added g | 904 390acb97e50a: added f |
| 905 phase-divergent: 21ae52e414e6 (immutable precursor) | 905 phase-divergent: 21ae52e414e6 (immutable precursor) |
| 906 phase-divergent: 428f7900a969 (immutable precursor) | 906 phase-divergent: 428f7900a969 (immutable precursor) |
| 907 | 907 |
| 908 Resolving phase divergence using `hg evolve` | 908 Resolving phase divergence using `hg evolve` |
| 909 | 909 |
| 910 $ hg evolve --phase-divergent --all | 910 $ hg evolve --phase-divergent --all |
| 911 recreate:[24] added g | 911 recreate:[24] added f |
| 912 atop:[23] added g | 912 atop:[23] added g |
| 913 rebasing to destination parent: 21ae52e414e6 | 913 rebasing to destination parent: 21ae52e414e6 |
| 914 computing new diff | 914 computing new diff |
| 915 committed as 428f7900a969 | 915 committed as 428f7900a969 |
| 916 working directory is now at 428f7900a969 | 916 working directory is now at 428f7900a969 |