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

Tests the resolution of content divergence: basic cases

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

This file intend to cover basic case of content divergence. See the other test

file for more advanced cases.

  $ cat >> $HGRCPATH <<EOF

  > [alias]

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

  > [defaults]

  > amend=-d "0 0"

  > fold=-d "0 0"

  > [web]

  > push_ssl = false

  > allow_push = *

  > [phases]

  > publish = False

  > [diff]

  > git = 1

  > unified = 0

  > [ui]

  > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline} [{instabilities}]\n

  > [extensions]

  > EOF

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

  $ mkcommit() {

  >    echo "$1" > "$1"

  >    hg add "$1"

  >    hg ci -m "add $1"

  > }

  $ mkcommits() {

  >   for i in $@; do mkcommit $i ; done

  > }

Basic test of divergence: two divergent changesets with the same parents

With --all --any we dedupe the divergent and solve the divergence once

  $ hg init test1

  $ cd test1

  $ echo a > a

  $ hg ci -Aqm "added a"

  $ echo b > b

  $ hg ci -Aqm "added b"

  $ hg export

  # HG changeset patch

  # User test

  # Date 0 0

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

  # Node ID 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d

  # Parent  9092f1db7931481f93b37d5c9fbcfc341bcd7318

  added b

  diff --git a/b b/b

  new file mode 100644

  --- /dev/null

  +++ b/b

  @@ -0,0 +1,1 @@

  +b

  $ hg up .^

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

  $ echo bdivergent > bdivergent1

  $ hg ci -Am "divergent"

  adding bdivergent1

  created new head

  $ hg export

  # HG changeset patch

  # User test

  # Date 0 0

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

  # Node ID 593c57f2117e33dd0884382f02789d948f548557

  # Parent  9092f1db7931481f93b37d5c9fbcfc341bcd7318

  divergent

  diff --git a/bdivergent1 b/bdivergent1

  new file mode 100644

  --- /dev/null

  +++ b/bdivergent1

  @@ -0,0 +1,1 @@

  +bdivergent

  $ hg up .^

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

  $ echo bdivergent > bdivergent2

  $ hg ci -Am "divergent"

  adding bdivergent2

  created new head

  $ hg export

  # HG changeset patch

  # User test

  # Date 0 0

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

  # Node ID 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96

  # Parent  9092f1db7931481f93b37d5c9fbcfc341bcd7318

  divergent

  diff --git a/bdivergent2 b/bdivergent2

  new file mode 100644

  --- /dev/null

  +++ b/bdivergent2

  @@ -0,0 +1,1 @@

  +bdivergent

  $ hg prune -s 8374d2ddc3a4 "desc('added b')"

  1 changesets pruned

  $ hg prune -s 593c57f2117e "desc('added b')" --hidden

  1 changesets pruned

  $ hg log -G --patch

  @  3:8374d2ddc3a4@default(draft) divergent [content-divergent]

  |  diff --git a/bdivergent2 b/bdivergent2

  |  new file mode 100644

  |  --- /dev/null

  |  +++ b/bdivergent2

  |  @@ -0,0 +1,1 @@

  |  +bdivergent

  |

  | o  2:593c57f2117e@default(draft) divergent [content-divergent]

  |/   diff --git a/bdivergent1 b/bdivergent1

  |    new file mode 100644

  |    --- /dev/null

  |    +++ b/bdivergent1

  |    @@ -0,0 +1,1 @@

  |    +bdivergent

  |

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

     diff --git a/a b/a

     new file mode 100644

     --- /dev/null

     +++ b/a

     @@ -0,0 +1,1 @@

     +a

  $ hg evolve --all --any --content-divergent

  merge:[2] divergent

  with: [3] divergent

  base: [1] added b

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

  working directory is now at 45bf1312f454

  $ hg log -G

  @  4:45bf1312f454@default(draft) divergent []

  |

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

  $ hg export

  # HG changeset patch

  # User test

  # Date 0 0

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

  # Node ID 45bf1312f45468b76158b33f8426e6530c8b35b1

  # Parent  9092f1db7931481f93b37d5c9fbcfc341bcd7318

  divergent

  diff --git a/bdivergent1 b/bdivergent1

  new file mode 100644

  --- /dev/null

  +++ b/bdivergent1

  @@ -0,0 +1,1 @@

  +bdivergent

  diff --git a/bdivergent2 b/bdivergent2

  new file mode 100644

  --- /dev/null

  +++ b/bdivergent2

  @@ -0,0 +1,1 @@

  +bdivergent

  $ cd ..

Extra setup

-----------

(the test below were initially in a different file)

  $ 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

Merging branch difference

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

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

have different branches

  $ hg branch --force 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

  $ hg glog

  @  6:264b04f771fb added d

  |   () [watwat] draft

  | o  5: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 --no-all --config ui.interactive=True << EOF

  > c

  > EOF

  merge:[6] added d

  with: [5] added d

  base: [4] added d

  merging "other" content-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

  @  7: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

  $ hg glog

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

  |   () [default] draft

  | o  8: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 --no-all

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

  with: [8] added d

  base: [7] added d

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

  working directory is now at a9d6fd6b5e40

  $ hg glog

  @  10: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"

  $ hg glog

  @  12:0bb497fed24a foo to d

  |   () [default] draft

  | o  11: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 --no-all

  merge:[12] foo to d

  with: [11] foo to d

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

  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

  @  13: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)