comparison tests/test-evolve-content-divergence.t @ 4420:6a20e0e9b957 stable

evolve: make sure user can recover from conflict (issue6053)

we make sure while continuing interrupted evolve it reach to right code

This patch fix the issue6053 which is about falling evolve into unrecoverable
state and this is how it call fall into it:

If after some rewrite operations we reach to a point where resparent for
two content divergent csets is obsolete and we hit a conflict in
relocation, so now if you run `hg evolve --continue` after resolving
the conflict: code execution would check if wdir parent is obsolete
and run solveobswdp() rather than going to continueevolve() part
and there we will hit by a "abort: outstanding uncommitted merge"
And same for `--abort` or `--stop` flags.

Changes in tests reflect the fixed behaviour.

4419:1fdecdfd0df9

  |   () [default] draft
  o  0:8fa14d15e168 added hgignore
      () [default] draft


Test which demonstrate that evolve can fall into unrecoverable state (issue6053):
---------------------------------------------------------------------------------
  $ cd ..
  $ hg init localside
  $ cd localside
  $ for ch in a b c d e; do
  > echo $ch > $ch;

  $ hg res -m
  (no more unresolved files)
  continue: hg evolve --continue

  $ hg evolve --continue
  update:[2] added c
  abort: outstanding uncommitted merge
  [255]

  $ hg evolve --abort
  update:[2] added c
  abort: outstanding uncommitted merge
  [255]

  $ hg ci -m "merge commit"
  abort: evolve in progress
  (use 'hg evolve --continue' or 'hg evolve --abort' to abort)
  [255]

4420:6a20e0e9b957

  |   () [default] draft
  o  0:8fa14d15e168 added hgignore
      () [default] draft


Test to make sure that evolve don't fall into unrecoverable state (issue6053):
------------------------------------------------------------------------------
  $ cd ..
  $ hg init localside
  $ cd localside
  $ for ch in a b c d e; do
  > echo $ch > $ch;

  $ hg res -m
  (no more unresolved files)
  continue: hg evolve --continue

  $ hg evolve --continue
  evolving 6:de4ea3103326 "updated e"
  updating to "local" side of the conflict: ff6f7cd76a7c
  merging "other" content-divergent changeset 'e504bd82de7e'
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  working directory is now at 83b1664a580f

  $ hg glog -l1
  @  8:83b1664a580f updated e
  |   () [default] draft
  ~