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

Tests the resolution of content divergence: corner cases

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

This file intend to cover cases that are specific enough to not fit in the

other 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

  > [experimental]

  > evolution.allowdivergence = True

  > [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

  $ hg ci -Am "divergent"

  adding bdivergent1

  created new head

  $ 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 prune -s 8374d2ddc3a4 "desc('added b')"

  1 changesets pruned

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

  1 changesets pruned

  2 new content-divergent changesets

  $ hg log -G

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

  |

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

  |/

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

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

  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 98ab969ac8fb

  $ hg log -G

  @  4:98ab969ac8fb@default(draft) divergent []

  |

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

  $ hg debugobsolete

  5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}

  5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 593c57f2117e33dd0884382f02789d948f548557 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}

  593c57f2117e33dd0884382f02789d948f548557 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}

  8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}

  $ hg obslog --all

  @    98ab969ac8fb (4) divergent

  |\     amended(content) from 593c57f2117e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)

  | |    amended(content) from 8374d2ddc3a4 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)

  | |

  x |  593c57f2117e (2) divergent

  | |    rewritten(description, content) from 5f6d8a4bf34a using prune by test (Thu Jan 01 00:00:00 1970 +0000)

  | |

  | x  8374d2ddc3a4 (3) divergent

  |/     rewritten(description, content) from 5f6d8a4bf34a using prune by test (Thu Jan 01 00:00:00 1970 +0000)

  |

  x  5f6d8a4bf34a (1) added b

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

  $ hg ci -m "add _c"

  created new head

  $ hg log -G

  @  7:b2ae71172042@default(draft) add _c []

  |

  | o  6:e3ff64ce8d4c@default(draft) add cdivergent1 []

  |/

  | o  5:48819a835615@default(draft) add _c []

  |/

  | o  4:98ab969ac8fb@default(draft) divergent []

  |/

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

  $ hg prune -s b2ae71172042 48819a835615

  1 changesets pruned

  $ hg prune -s e3ff64ce8d4c 48819a835615 --hidden

  1 changesets pruned

  2 new content-divergent changesets

  $ hg log -G

  @  7:b2ae71172042@default(draft) add _c [content-divergent]

  |

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

  |/

  | o  4:98ab969ac8fb@default(draft) divergent []

  |/

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

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

  merge:[6] add cdivergent1

  with: [7] add _c

  base: [5] add _c

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

  working directory is now at 6b3776664a25

  $ hg log -G

  @  8:6b3776664a25@default(draft) add cdivergent1 []

  |

  | o  4:98ab969ac8fb@default(draft) divergent []

  |/

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

  $ hg debugobsolete

  5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}

  5f6d8a4bf34ab274ccc9f631c2536964b8a3666d 593c57f2117e33dd0884382f02789d948f548557 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}

  593c57f2117e33dd0884382f02789d948f548557 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}

  8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}

  48819a83561596ef0aeac4082eaaa8afe4320f3a b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'prune', 'user': 'test'}

  48819a83561596ef0aeac4082eaaa8afe4320f3a e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}

  e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3 6b3776664a258aa4c7e13f90df20ae9170995217 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}

  b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49 6b3776664a258aa4c7e13f90df20ae9170995217 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'evolve', 'user': 'test'}

  $ hg obslog --all

  @    6b3776664a25 (8) add cdivergent1

  |\     reworded(description) from b2ae71172042 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)

  | |    rewritten from e3ff64ce8d4c using evolve by test (Thu Jan 01 00:00:00 1970 +0000)

  | |

  x |  b2ae71172042 (7) add _c

  | |    amended(content) from 48819a835615 using prune by test (Thu Jan 01 00:00:00 1970 +0000)

  | |

  | x  e3ff64ce8d4c (6) add cdivergent1

  |/     rewritten(description, content) from 48819a835615 using prune by test (Thu Jan 01 00:00:00 1970 +0000)

  |

  x  48819a835615 (5) add _c

  $ 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

  $ hg ci -Am "bdivergent"

  adding bdivergent11

  created new head

  $ hg up .^

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

  $ echo bdivergent > bdivergent22

  $ hg ci -Am "bdivergent"

  adding bdivergent22

  created new head

  $ hg log -G

  @  3:6b096fb45070@default(draft) bdivergent []

  |

  | o  2:05a6b6a9e633@default(draft) bdivergent []

  |/

  | o  1:37445b16603b@default(draft) add _b []

  |/

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

  $ hg prune -s 6b096fb45070 37445b16603b

  1 changesets pruned

  $ hg prune -s 05a6b6a9e633 37445b16603b --hidden

  1 changesets pruned

  2 new content-divergent changesets

  $ hg log -G

  @  3:6b096fb45070@default(draft) bdivergent [content-divergent]

  |

  | *  2:05a6b6a9e633@default(draft) bdivergent [content-divergent]

  |/

  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

  nothing to evolve on current working copy parent

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

  [2]

  $ hg evolve --content-divergent

  merge:[2] bdivergent

  with: [3] bdivergent

  base: [1] add _b

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

  working directory is now at b87e0354d5cb

  $ hg log -G

  @  4:b87e0354d5cb@default(draft) bdivergent []

  |

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

  $ hg debugobsolete

  37445b16603b50165d5eb80735fb986c72a2dac1 6b096fb450709a194b21fb9b192fe9b1572c4af0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}

  37445b16603b50165d5eb80735fb986c72a2dac1 05a6b6a9e633802d2bdd06e6d292982a767d930e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}

  05a6b6a9e633802d2bdd06e6d292982a767d930e b87e0354d5cb081210298429d8b51de9871155a2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}

  6b096fb450709a194b21fb9b192fe9b1572c4af0 b87e0354d5cb081210298429d8b51de9871155a2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}

  $ hg obslog --all

  @    b87e0354d5cb (4) bdivergent

  |\     amended(content) from 05a6b6a9e633 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)

  | |    amended(content) from 6b096fb45070 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)

  | |

  x |  05a6b6a9e633 (2) bdivergent

  | |    rewritten(description, content) from 37445b16603b using prune by test (Thu Jan 01 00:00:00 1970 +0000)

  | |

  | x  6b096fb45070 (3) bdivergent

  |/     rewritten(description, content) from 37445b16603b using prune by test (Thu Jan 01 00:00:00 1970 +0000)

  |

  x  37445b16603b (1) add _b

  $ cd ..

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.

  $ hg init localside

  $ cd localside

  $ for ch in a b c d e; do

  > echo $ch > $ch;

  > hg add $ch;

  > hg ci -m "added "$ch;

  > done;

  $ hg glog

  @  4:8d71eadcc9df added e

  |   () [default] draft

  o  3:9150fe93bec6 added d

  |   () [default] draft

  o  2:155349b645be added c

  |   () [default] draft

  o  1:5f6d8a4bf34a added b

  |   () [default] draft

  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

  @  6:de4ea3103326 updated e

  |   () [default] draft

  | *  5:ff6f7cd76a7c updated e

  | |   () [default] draft

  | x  3:9150fe93bec6 added d

  | |   () [default] draft

  | o  2:155349b645be added c

  |/    () [default] draft

  o  1:5f6d8a4bf34a added b

  |   () [default] draft

  o  0:9092f1db7931 added a

      () [default] draft