evolve: add logic to handle a particular case in divergence resolution
Case is: In content divergence, to check if the two csets are on different
parent or same parent what we do is find gca of the two csets and then
compare it with the singlesuccessors of two csets's parents.
Now, if gca is same as singlesuccessors of both the csets then we conclude
that both are on the same parent which is not totally correct as it is
possible that both the parents of two csets are obsolete with a single
successor.
This patch adds the logic to cover the above metioned case correctly,
deciding the part when we need to relocate a cset to other side while
resolving the stack of divergent csets.
Changes in test file demonstrate that before this patch we were not
doing it right because it should have relocated every node to other side
instead of just relocating the first one from the stack.
Testing evolve --continue with unresolved conflicts (issue5966)
https://bz.mercurial-scm.org/show_bug.cgi?id=5966
$ . $TESTDIR/testlib/common.sh
$ hg init issue5966
$ cd issue5966
$ cat > .hg/hgrc << EOF
> [phases]
> publish = false
> [alias]
> glog = log -GT "{rev}: {desc}"
> [extensions]
> evolve=
> EOF
$ touch a
$ hg ci -Aqm 'empty'
$ echo apple > a
$ hg ci -m 'apple'
$ echo banana > a
$ hg ci -m 'banana'
$ echo coconut > a
$ hg ci -m 'coconut'
$ hg glog
@ 3: coconut
|
o 2: banana
|
o 1: apple
|
o 0: empty
$ hg up -q 1
Amending revision 1 in a way that causes conflicts
$ echo apricot > a
$ hg amend -m 'apricot'
2 new orphan changesets
$ hg glog --hidden
@ 4: apricot
|
| * 3: coconut
| |
| * 2: banana
| |
| x 1: apple
|/
o 0: empty
$ hg evolve -t :fail
move:[2] banana
atop:[4] apricot
fix conflicts and see `hg help evolve.interrupted`
[1]
$ hg evolve --list
34a690fcf6ab: banana
orphan: 7f59f18ca4a9 (obsolete parent)
feb8c0bffa1f: coconut
orphan: 34a690fcf6ab (orphan parent)
Evolve should detect unresolved conflict.
$ hg resolve --list
U a
$ hg evolve --continue
abort: unresolved merge conflicts (see 'hg help resolve')
[255]
(even when ran twice)
$ hg evolve --continue
abort: unresolved merge conflicts (see 'hg help resolve')
[255]
$ cat a
apricot
$ hg resolve --list
U a
$ hg resolve a -t :other
(no more unresolved files)
continue: hg evolve --continue
$ hg resolve --list
R a
$ hg evolve --continue
evolving 2:34a690fcf6ab "banana"
working directory is now at e4207a610ed0
$ hg resolve --list
evolve the rest of the stack
$ hg evolve
move:[3] coconut
atop:[5] banana
merging a
working directory is now at d77b4639fe26
All commit evolved
$ hg glog
@ 6: coconut
|
o 5: banana
|
o 4: apricot
|
o 0: empty