Mercurial > evolve
changeset 3619:914d3cf8d392
tests: temporary delete the merge test of handling phase divergence
This patch temporary deletes the merge test of handling phase divergence by `hg
evolve` command to that other important tests can be plugged in before this.
This will make adding more tests easy. As I say, this is temporary to ease out
adding more tests, the test will be added back.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 23 Mar 2018 13:16:42 +0530 |
| parents | 2d8e39919742 |
| children | 1f020455f6fe |
| files | tests/test-evolve-phase-divergence.t |
| diffstat | 1 files changed, 0 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t Fri Mar 30 19:38:55 2018 +0200 +++ b/tests/test-evolve-phase-divergence.t Fri Mar 23 13:16:42 2018 +0530 @@ -199,51 +199,3 @@ | () public o 0:d3873e73d99e init () public - -Bumped Merge changeset: ------------------------ - -We currently cannot automatically solve bumped changeset that is the -product of a merge, we add a test for it. - - $ mkcommit _a - $ hg up .^ - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ mkcommit _b - created new head - $ mkcommit _c - $ hg log -G - @ 5:eeaf70969381@default(draft) add _c - | - o 4:6612fc0ddeb6@default(draft) add _b - | - | o 3:154ad198ff4a@default(draft) add _a - |/ - o 1:4d1169d82e47@default(public) modify a - | - o 0:d3873e73d99e@default(public) init - - $ hg merge 3 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg commit -m "merge" - $ hg commit --amend -m "New message" - $ hg phase --public 551127da2a8a --hidden - 1 new phase-divergent changesets - $ hg log -G - @ 7:b28e84916d8c@default(draft) New message - |\ - +---o 6:551127da2a8a@default(public) merge - | |/ - | o 5:eeaf70969381@default(public) add _c - | | - | o 4:6612fc0ddeb6@default(public) add _b - | | - o | 3:154ad198ff4a@default(public) add _a - |/ - o 1:4d1169d82e47@default(public) modify a - | - o 0:d3873e73d99e@default(public) init - - $ hg evolve --all --phase-divergent - skipping b28e84916d8c : we do not handle merge yet