Tests the resolution of divergence

  $ cat >> $HGRCPATH <<EOF

  > [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} [{troubles}]\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 up .^

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

  $ echo bdivergent > bdivergent1

  adding bdivergent1

  created new head

  $ hg up .^

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

  $ echo bdivergent > bdivergent2

  adding bdivergent2

  created new head

  1 changesets pruned

  1 changesets pruned

  2 new content-divergent changesets

  $ hg log -G

  |

  |/

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

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

  base: [1] added b

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

  $ hg log -G

  |

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

Test divergence resolution when it yields to an empty commit (issue4950)

cdivergent2 contains the same content than cdivergent1 and they are divergent

versions of the revision _c

  $ hg up .^

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

  $ mkcommit _c

  created new head

  $ hg up .^

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

  $ mkcommit cdivergent1

  created new head

  $ hg up .^

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

  $ echo "cdivergent1" > cdivergent1

  $ hg add cdivergent1

  created new head

  1 changesets pruned

  1 changesets pruned

  2 new content-divergent changesets

  $ hg log -G

  |

  | *  6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent]

  |/

  |/

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

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

  merge:[6] add cdivergent1

  base: [5] add _c

  updating to "local" side of the conflict: e3ff64ce8d4c

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

  nothing changed

  working directory is now at e3ff64ce8d4c

  $ cd ..

Test None docstring issue of evolve divergent, which caused hg crush

  $ hg init test2

  $ cd test2

  $ mkcommits _a _b

  $ hg up .^

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

  $ echo bdivergent > bdivergent11

  adding bdivergent11

  created new head

  $ hg up .^

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

  $ echo bdivergent > bdivergent22

  adding bdivergent22

  created new head

  1 changesets pruned

  1 changesets pruned

  2 new content-divergent changesets

  $ hg log -G

  |

  |/

  o  0:135f39f4bd78@default(draft) add _a []

  $ cat >$TESTTMP/test_extension.py  << EOF

  > from mercurial import merge

  > origupdate = merge.update

  > def newupdate(*args, **kwargs):

  >   return origupdate(*args, **kwargs)

  > merge.update = newupdate

  > EOF

  $ cat >> $HGRCPATH << EOF

  > [extensions]

  > testextension=$TESTTMP/test_extension.py

  > EOF

  $ hg evolve --all

  nothing to evolve on current working copy parent

  (do you want to use --content-divergent)

  [2]

  $ hg evolve --content-divergent

  base: [1] add _b

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

  $ cd ..