Mercurial > evolve
comparison tests/test-evolve-content-divergence.t @ 3845:5c964ebe4d4b
evolve: always order the revs to be evolved
The current code only order the revs if we are resolving orphans and not in
other case. The ordering is important when we pass --all and tackle multiple
occurence of the same instability.
Let's order the revs for each instability. There are enough test coverage of
phase-divergence and content-divergence that I feel confident doing it because
none of the test changed.
The change in test-evolve-content-divergent.t demonstrates the indeed ordering
helped.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Tue, 12 Jun 2018 23:20:54 +0530 |
| parents | 48fbccfd1dff |
| children | f9dad99a90d5 |
comparison
equal
deleted
inserted
replaced
| 3844:48fbccfd1dff | 3845:5c964ebe4d4b |
|---|---|
| 866 o 0:8fa14d15e168 added hgignore | 866 o 0:8fa14d15e168 added hgignore |
| 867 () [default] draft | 867 () [default] draft |
| 868 | 868 |
| 869 XXX: we are not resolving divergence in the correct order here | 869 XXX: we are not resolving divergence in the correct order here |
| 870 $ hg evolve --all --content-divergent | 870 $ hg evolve --all --content-divergent |
| 871 skipping c72d2885eb51: have a different parent than 513e3267034e (not handled yet) | |
| 872 | c72d2885eb51, 513e3267034e are not based on the same changeset. | |
| 873 | With the current state of its implementation, | |
| 874 | evolve does not work in that case. | |
| 875 | rebase one of them next to the other and run | |
| 876 | this command again. | |
| 877 | - either: hg rebase --dest 'p1(c72d2885eb51)' -r 513e3267034e | |
| 878 | - or: hg rebase --dest 'p1(513e3267034e)' -r c72d2885eb51 | |
| 879 merge:[5] watbar to a | 871 merge:[5] watbar to a |
| 880 with: [9] watbar to a | 872 with: [9] watbar to a |
| 881 base: [1] added a | 873 base: [1] added a |
| 882 updating to "local" side of the conflict: 8e222f257bbf | 874 updating to "local" side of the conflict: 8e222f257bbf |
| 883 merging "other" content-divergent changeset '2587cb3ef1fe' | 875 merging "other" content-divergent changeset '2587cb3ef1fe' |
| 908 | evolve does not work in that case. | 900 | evolve does not work in that case. |
| 909 | rebase one of them next to the other and run | 901 | rebase one of them next to the other and run |
| 910 | this command again. | 902 | this command again. |
| 911 | - either: hg rebase --dest 'p1(3ce4be6d8e5e)' -r accb7a2b6ae9 | 903 | - either: hg rebase --dest 'p1(3ce4be6d8e5e)' -r accb7a2b6ae9 |
| 912 | - or: hg rebase --dest 'p1(accb7a2b6ae9)' -r 3ce4be6d8e5e | 904 | - or: hg rebase --dest 'p1(accb7a2b6ae9)' -r 3ce4be6d8e5e |
| 905 skipping c72d2885eb51: have a different parent than 513e3267034e (not handled yet) | |
| 906 | c72d2885eb51, 513e3267034e are not based on the same changeset. | |
| 907 | With the current state of its implementation, | |
| 908 | evolve does not work in that case. | |
| 909 | rebase one of them next to the other and run | |
| 910 | this command again. | |
| 911 | - either: hg rebase --dest 'p1(c72d2885eb51)' -r 513e3267034e | |
| 912 | - or: hg rebase --dest 'p1(513e3267034e)' -r c72d2885eb51 | |
| 913 working directory is now at df46e196f3c4 | 913 working directory is now at df46e196f3c4 |
| 914 | 914 |
| 915 $ hg glog | 915 $ hg glog |
| 916 @ 13:df46e196f3c4 watbar to a | 916 @ 13:df46e196f3c4 watbar to a |
| 917 | () [default] draft | 917 | () [default] draft |