comparison tests/test-evolve-content-divergence.t @ 4424:d52f14bdb468 stable

test: include some documentation to describe the case briefly

4423:144cd06029de

  |   () [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;

  o  0:9092f1db7931 added a
      () [default] draft

  $ echo ee > e
  $ hg amend -m "updated e"

  $ hg up 1 -q
  $ echo dd > d
  $ echo ee > e
  $ hg add d e
  $ hg ci -m "updated e"
  created new head

  $ hg prune 4 -s . --hidden
  1 changesets pruned
  2 new content-divergent changesets

  $ hg prune 3
  1 changesets pruned
  1 new orphan changesets

  $ hg glog

4424:d52f14bdb468

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


Test to make sure that evolve don't fall into unrecoverable state (issue6053)
------------------------------------------------------------------------------

It happened when two divergent csets has different parent (need relocation)
and resolution parent is obsolete. So this issue triggered when during
relocation we hit conflicts. So lets make the repo as described.

  $ cd ..
  $ hg init localside
  $ cd localside
  $ for ch in a b c d e; do
  > echo $ch > $ch;

  o  0:9092f1db7931 added a
      () [default] draft

  $ echo ee > e
  $ hg amend -m "updated e"
  $ hg up 1 -q

To make sure we hit conflict while relocating
  $ echo dd > d
  $ echo ee > e
  $ hg add d e
  $ hg ci -m "updated e"
  created new head

Lets create divergence
  $ hg prune 4 -s . --hidden
  1 changesets pruned
  2 new content-divergent changesets

Making obsolete resolution parent
  $ hg prune 3
  1 changesets pruned
  1 new orphan changesets

  $ hg glog