** Test for handling of content divergent changesets by `hg evolve` **

====================================================================

  $ cat >> $HGRCPATH <<EOF

  > [alias]

  > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) [{branch}] {phase}"

  > [phases]

  > publish = False

  > [extensions]

  > rebase =

  > EOF

  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH

  $ hg init cdiv

  $ cd cdiv

  $ echo ".*\.orig" > .hgignore

  $ hg add .hgignore

  $ hg ci -m "added hgignore"

  $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;

  $ hg glog

  @  4:c41c793e0ef1 added d

  |   () [default] draft

  o  3:ca1b80f7960a added c

  |   () [default] draft

  o  2:b1661037fa25 added b

  |   () [default] draft

  o  1:c7586e2a9264 added a

  |   () [default] draft

  o  0:8fa14d15e168 added hgignore

      () [default] draft

Creating content-divergence with branch change where base, divergent and other

have different branches

-------------------------------------------------------------------------------

  $ hg branch foobar

  marked working directory as branch foobar

  (branches are permanent and global, did you want a bookmark?)

  $ hg amend

  $ hg up c41c793e0ef1 --hidden

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  working directory parent is obsolete! (c41c793e0ef1)

  (use 'hg evolve' to update to its successor: bdeedce1f621)

  $ echo bar > d

  $ hg branch watwat

  marked working directory as branch watwat

  $ hg amend

  2 new divergent changesets

  $ hg glog

  @  8:264b04f771fb added d

  |   () [watwat] draft

  | o  6:bdeedce1f621 added d

  |/    () [foobar] draft

  o  3:ca1b80f7960a added c

  |   () [default] draft

  o  2:b1661037fa25 added b

  |   () [default] draft

  o  1:c7586e2a9264 added a

  |   () [default] draft

  o  0:8fa14d15e168 added hgignore

      () [default] draft

  $ hg evolve --content-divergent --config ui.interactive=True<<EOF

  > c

  > EOF

  merge:[8] added d

  with: [6] added d

  base: [4] added d

  merging "other" divergent changeset 'bdeedce1f621'

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  content divergent changesets on different branches.

  choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar?  c

  working directory is now at 0ac42f1bc15c

  $ hg glog

  @  9:0ac42f1bc15c added d

  |   () [foobar] draft

  o  3:ca1b80f7960a added c

  |   () [default] draft

  o  2:b1661037fa25 added b

  |   () [default] draft

  o  1:c7586e2a9264 added a

  |   () [default] draft

  o  0:8fa14d15e168 added hgignore

      () [default] draft

Testing merging of commit messages

-----------------------------------

When base and one of the divergent has same commit messages and other divergent

has different one

  $ echo wat > d

  $ hg amend

  $ hg up .^

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ echo bar > d

  $ hg ci -Aqm "added a d with bar in it, expect some beers"

  $ hg prune -r 0ac42f1bc15c -s . --hidden

  1 changesets pruned

  2 new divergent changesets

  $ hg glog

  @  12:59081c9c425a added a d with bar in it, expect some beers

  |   () [default] draft

  | o  11:f621d00f5f0e added d

  |/    () [foobar] draft

  o  3:ca1b80f7960a added c

  |   () [default] draft

  o  2:b1661037fa25 added b

  |   () [default] draft

  o  1:c7586e2a9264 added a

  |   () [default] draft

  o  0:8fa14d15e168 added hgignore

      () [default] draft

  $ hg evolve --content-divergent

  merge:[12] added a d with bar in it, expect some beers

  with: [11] added d

  base: [9] added d

  merging "other" divergent changeset 'f621d00f5f0e'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  working directory is now at a9d6fd6b5e40

  $ hg glog

  @  13:a9d6fd6b5e40 added a d with bar in it, expect some beers

  |   () [default] draft

  o  3:ca1b80f7960a added c

  |   () [default] draft

  o  2:b1661037fa25 added b

  |   () [default] draft

  o  1:c7586e2a9264 added a

  |   () [default] draft

  o  0:8fa14d15e168 added hgignore

      () [default] draft

When base has different message and both divergents has same one

  $ echo foo > d

  $ hg amend -m "foo to d"

  $ hg up a9d6fd6b5e40 --hidden

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  working directory parent is obsolete! (a9d6fd6b5e40)

  (use 'hg evolve' to update to its successor: b10b07a394f1)

  $ echo babar > d

  $ hg amend -m "foo to d"

  2 new divergent changesets

  $ hg glog

  @  17:0bb497fed24a foo to d

  |   () [default] draft

  | o  15:b10b07a394f1 foo to d

  |/    () [default] draft

  o  3:ca1b80f7960a added c

  |   () [default] draft

  o  2:b1661037fa25 added b

  |   () [default] draft

  o  1:c7586e2a9264 added a

  |   () [default] draft

  o  0:8fa14d15e168 added hgignore

      () [default] draft

  $ hg evolve --content-divergent

  merge:[17] foo to d

  with: [15] foo to d

  base: [13] added a d with bar in it, expect some beers

  merging "other" divergent changeset 'b10b07a394f1'

  merging d

  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  fix conflicts and see `hg help evolve.interrupted`

  [1]

  $ echo foobar > d

  $ hg resolve -m

  (no more unresolved files)

  continue: hg evolve --continue

  $ hg evolve --continue

  working directory is now at 11175423b5dc

  $ hg glog

  @  18:11175423b5dc foo to d

  |   () [default] draft

  o  3:ca1b80f7960a added c

  |   () [default] draft

  o  2:b1661037fa25 added b

  |   () [default] draft

  o  1:c7586e2a9264 added a

  |   () [default] draft

  o  0:8fa14d15e168 added hgignore

      () [default] draft

When all three base, divergent and other has different commit messages creating

conflicts

  $ echo bar > d

  $ hg amend -m "bar to d, expect beers"

  $ hg up 11175423b5dc --hidden

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  working directory parent is obsolete! (11175423b5dc)

  (use 'hg evolve' to update to its successor: 27f0463f169a)

  $ echo wat > d

  $ hg amend -m "wat to d, wat?"

  2 new divergent changesets

  $ hg glog

  @  22:f542037ddf31 wat to d, wat?

  |   () [default] draft

  | o  20:27f0463f169a bar to d, expect beers

  |/    () [default] draft

  o  3:ca1b80f7960a added c

  |   () [default] draft

  o  2:b1661037fa25 added b

  |   () [default] draft

  o  1:c7586e2a9264 added a

  |   () [default] draft

  o  0:8fa14d15e168 added hgignore

      () [default] draft

  $ hg evolve --content-divergent

  merge:[22] wat to d, wat?

  with: [20] bar to d, expect beers

  base: [18] foo to d

  merging "other" divergent changeset '27f0463f169a'

  merging d

  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  fix conflicts and see `hg help evolve.interrupted`

  [1]

  $ echo watbar > d

  $ hg resolve -m

  (no more unresolved files)

  continue: hg evolve --continue

  $ cat > editor.sh <<EOF

  > #!/bin/sh

  > printf "**showing editors text**\n\n"

  > cat \$1

  > printf "\n**done showing editors text**\n\n"

  > cat > \$1 <<ENDOF

  > watbar to d

  > ENDOF

  > EOF

  $ HGEDITOR='sh ./editor.sh' hg evolve --continue

  **showing editors text**

  HG: Conflicts while merging changeset description of content-divergent changesets.

  HG: Resolve conflicts in commit messages to continue.

  <<<<<<< divergent

  wat to d, wat?||||||| base

  foo to d=======

  bar to d, expect beers>>>>>>> other

  **done showing editors text**

  working directory is now at 89ea3eee2d69

  $ hg glog

  @  23:89ea3eee2d69 watbar to d

  |   () [default] draft

  o  3:ca1b80f7960a added c

  |   () [default] draft

  o  2:b1661037fa25 added b

  |   () [default] draft

  o  1:c7586e2a9264 added a

  |   () [default] draft

  o  0:8fa14d15e168 added hgignore

      () [default] draft

  $ cd ..

Testing resolution of content-divergent changesets when they are on different

parents and resolution and relocation wont result in conflicts

------------------------------------------------------------------------------

  $ hg init multiparents

  $ cd multiparents

  $ echo ".*\.orig" > .hgignore

  $ hg add .hgignore

  $ hg ci -m "added hgignore"

  $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;

  $ hg glog

  @  4:c41c793e0ef1 added d

  |   () [default] draft

  o  3:ca1b80f7960a added c

  |   () [default] draft

  o  2:b1661037fa25 added b

  |   () [default] draft

  o  1:c7586e2a9264 added a

  |   () [default] draft

  o  0:8fa14d15e168 added hgignore

      () [default] draft

  $ hg up .^^

  0 files updated, 0 files merged, 2 files removed, 0 files unresolved

  $ echo bar > b

  $ hg amend

  2 new unstable changesets

  $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True

  rebasing 2:b1661037fa25 "added b"

  2 new divergent changesets

  $ hg glog

  o  7:da4b96f4a8d6 added b

  |   () [default] draft

  | @  6:7ed0642d644b added b

  | |   () [default] draft

  | | o  4:c41c793e0ef1 added d

  | | |   () [default] draft

  | | o  3:ca1b80f7960a added c

  | | |   () [default] draft

  | | x  2:b1661037fa25 added b

  | |/    () [default] draft

  | o  1:c7586e2a9264 added a

  |/    () [default] draft

  o  0:8fa14d15e168 added hgignore

      () [default] draft

  $ hg evolve --content-divergent

  merge:[6] added b

  with: [7] added b

  base: [2] added b

  rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264

  updating to "local" side of the conflict: 7ed0642d644b

  merging "other" divergent changeset '11f849d7159f'

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  working directory is now at 171614c9a791

  $ hg glog

  @  9:171614c9a791 added b

  |   () [default] draft

  | o  4:c41c793e0ef1 added d

  | |   () [default] draft

  | o  3:ca1b80f7960a added c

  | |   () [default] draft

  | x  2:b1661037fa25 added b

  |/    () [default] draft

  o  1:c7586e2a9264 added a

  |   () [default] draft

  o  0:8fa14d15e168 added hgignore

      () [default] draft

  $ hg exp

  # HG changeset patch

  # User test

  # Date 0 0

  #      Thu Jan 01 00:00:00 1970 +0000