Commit 9b8fa196 authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

evolve: add test for `--continue` case when relocating "divergent"

This test shows that for now we don't handle the continue case when
relocating "divergent" cset hit merge conflict while resolving

Next patch will be adding the support for --continue case.
parent 35870ce163ee
......@@ -10,6 +10,7 @@ This file intend to cover case with stacks of divergent changesets
> [phases]
> publish = False
> [extensions]
> strip =
> rebase =
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
......@@ -348,6 +349,49 @@ Resolving content-divergence of a stack with different parents
| () [default] draft
o 0:8fa14d15e168 added hgignore
() [default] draft
when "divergent" and "other" both hit merge conflict in relocating
$ hg strip 14: --hidden
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/74fbf3e6a0b6-f3612603-backup.hg
8 new content-divergent changesets
Prepare repo to have merge conflicts
$ hg up -r "max(desc('added a'))"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg evolve -r . --content-divergent
merge:[10] added a
with: [5] watbar to a
base: [1] added a
rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6 new orphan changesets
working directory is now at 74fbf3e6a0b6
$ echo b_conflict > b
$ hg amend -A
adding b
Let's try to evolve stack
$ hg evolve --content-divergent
merge:[11] added b
with: [6] added b
base: [2] added b
rebasing "divergent" content-divergent changeset 6eb54b5af3fb on 119989a4317e
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved merge conflicts
(see 'hg help evolve.interrupted')
$ echo b > b
$ hg res -m
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue 2>&1 | grep "KeyError"
KeyError: 'resolutionparent'
$ cd ..
Make sure that content-divergent resolution doesn't undo a change (issue6203)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment