tests/test-evolve-content-divergent-stack.t
author Sushil khanchi <sushilkhanchi97@gmail.com>
Wed, 27 Nov 2019 12:34:19 +0530
changeset 5016 64868b7dc112
parent 5015 43f4784a3f21
child 5018 f1e90ce1d372
permissions -rw-r--r--
evolve: add logic to cover --continue case when relocating "divergent" Changes in test file demonstrate the added behaviour.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4424
diff changeset
     1
=================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4424
diff changeset
     2
Tests the resolution of content divergence: stack
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4424
diff changeset
     3
=================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4424
diff changeset
     4
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4424
diff changeset
     5
This file intend to cover case with stacks of divergent changesets
3790
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     6
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     7
  $ cat >> $HGRCPATH <<EOF
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     8
  > [alias]
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     9
  > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) [{branch}] {phase}"
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    10
  > [phases]
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    11
  > publish = False
3790
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    12
  > [extensions]
5015
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
    13
  > strip =
3804
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    14
  > rebase =
3790
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    15
  > EOF
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    16
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    17
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    18
Resolving content-divergence of a stack with same parents
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    19
---------------------------------------------------------
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    20
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    21
  $ hg init stacktest
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    22
  $ cd stacktest
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    23
  $ echo ".*\.orig" > .hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    24
  $ hg add .hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    25
  $ hg ci -m "added hgignore"
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    26
  $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    27
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    28
  $ hg glog
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    29
  @  4:c41c793e0ef1 added d
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    30
  |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    31
  o  3:ca1b80f7960a added c
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    32
  |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    33
  o  2:b1661037fa25 added b
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    34
  |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    35
  o  1:c7586e2a9264 added a
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    36
  |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    37
  o  0:8fa14d15e168 added hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    38
      () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    39
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    40
  $ cd ..
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    41
  $ hg init stack2
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    42
  $ cd stack2
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    43
  $ hg pull ../stacktest
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    44
  pulling from ../stacktest
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    45
  requesting all changes
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    46
  adding changesets
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    47
  adding manifests
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    48
  adding file changes
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    49
  added 5 changesets with 5 changes to 5 files
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
    50
  new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    51
  (run 'hg update' to get a working copy)
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    52
  $ hg glog
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    53
  o  4:c41c793e0ef1 added d
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    54
  |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    55
  o  3:ca1b80f7960a added c
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    56
  |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    57
  o  2:b1661037fa25 added b
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    58
  |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    59
  o  1:c7586e2a9264 added a
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    60
  |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    61
  o  0:8fa14d15e168 added hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    62
      () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    63
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    64
  $ hg up c7586e2a9264
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    65
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    66
  $ echo bar > a
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    67
  $ hg amend -m "watbar to a"
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    68
  3 new orphan changesets
3849
a17d4934c5ce tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
    69
  $ echo wat > a
a17d4934c5ce tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
    70
  $ hg amend -m "watbar to a"
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    71
  $ hg evolve --all
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    72
  move:[2] added b
3849
a17d4934c5ce tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
    73
  atop:[6] watbar to a
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    74
  move:[3] added c
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    75
  move:[4] added d
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    76
  $ hg glog
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
    77
  o  9:15c781f93cac added d
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    78
  |   () [default] draft
3849
a17d4934c5ce tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
    79
  o  8:9e5fb1d5b955 added c
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    80
  |   () [default] draft
3849
a17d4934c5ce tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
    81
  o  7:88516dccf68a added b
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    82
  |   () [default] draft
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
    83
  @  6:82b74d5dc678 watbar to a
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    84
  |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    85
  o  0:8fa14d15e168 added hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    86
      () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    87
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    88
  $ cd ../stacktest
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    89
  $ hg up .^^^
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    90
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    91
  $ echo wat > a
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    92
  $ hg amend -m "watbar to a"
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    93
  3 new orphan changesets
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    94
  $ hg evolve --all
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    95
  move:[2] added b
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    96
  atop:[5] watbar to a
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    97
  move:[3] added c
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    98
  move:[4] added d
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    99
  $ hg glog
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   100
  o  8:c72d2885eb51 added d
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   101
  |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   102
  o  7:3ce4be6d8e5e added c
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   103
  |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   104
  o  6:d5f148423c16 added b
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   105
  |   () [default] draft
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   106
  @  5:8e222f257bbf watbar to a
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   107
  |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   108
  o  0:8fa14d15e168 added hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   109
      () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   110
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   111
  $ hg pull ../stack2
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   112
  pulling from ../stack2
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   113
  searching for changes
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   114
  adding changesets
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   115
  adding manifests
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   116
  adding file changes
3849
a17d4934c5ce tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   117
  added 4 changesets with 0 changes to 4 files (+1 heads)
a17d4934c5ce tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   118
  5 new obsolescence markers
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   119
  8 new content-divergent changesets
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
   120
  new changesets 82b74d5dc678:15c781f93cac (4 drafts)
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   121
  (run 'hg heads' to see heads, 'hg merge' to merge)
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   122
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   123
  $ hg glog
3849
a17d4934c5ce tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   124
  *  12:15c781f93cac added d
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   125
  |   () [default] draft
3849
a17d4934c5ce tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   126
  *  11:9e5fb1d5b955 added c
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   127
  |   () [default] draft
3849
a17d4934c5ce tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   128
  *  10:88516dccf68a added b
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   129
  |   () [default] draft
3849
a17d4934c5ce tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   130
  *  9:82b74d5dc678 watbar to a
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   131
  |   () [default] draft
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   132
  | *  8:c72d2885eb51 added d
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   133
  | |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   134
  | *  7:3ce4be6d8e5e added c
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   135
  | |   () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   136
  | *  6:d5f148423c16 added b
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   137
  | |   () [default] draft
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   138
  | @  5:8e222f257bbf watbar to a
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   139
  |/    () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   140
  o  0:8fa14d15e168 added hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   141
      () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   142
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   143
  $ hg evolve --all --content-divergent
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   144
  merge:[5] watbar to a
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   145
  with: [9] watbar to a
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   146
  base: [1] added a
3849
a17d4934c5ce tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   147
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3850
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   148
  merge:[6] added b
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   149
  with: [10] added b
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   150
  base: [2] added b
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   151
  rebasing "divergent" content-divergent changeset d5f148423c16 on f66f262fff6c
3850
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   152
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   153
  merge:[7] added c
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   154
  with: [11] added c
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   155
  base: [3] added c
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   156
  rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on eadfd9d70680
3850
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   157
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   158
  merge:[8] added d
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   159
  with: [12] added d
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   160
  base: [4] added d
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   161
  rebasing "divergent" content-divergent changeset c72d2885eb51 on b2cac10f3836
3850
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   162
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   163
  working directory is now at f66f262fff6c
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   164
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   165
  $ hg glog
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   166
  o  19:038fe7db3d88 added d
3850
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   167
  |   () [default] draft
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   168
  o  17:b2cac10f3836 added c
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   169
  |   () [default] draft
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   170
  o  15:eadfd9d70680 added b
3850
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   171
  |   () [default] draft
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   172
  @  13:f66f262fff6c watbar to a
3850
340cf6fbe9e9 evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3849
diff changeset
   173
  |   () [default] draft
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   174
  o  0:8fa14d15e168 added hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   175
      () [default] draft
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   176
Resolving content-divergence of a stack with different parents
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   177
---------------------------------------------------------
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   178
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   179
  $ cd ..
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   180
  $ hg init stackrepo1
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   181
  $ cd stackrepo1
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   182
  $ echo ".*\.orig" > .hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   183
  $ hg add .hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   184
  $ hg ci -m "added hgignore"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   185
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   186
  $ for ch in a b c d;
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   187
  > do echo foo > $ch;
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   188
  > hg add $ch;
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   189
  > hg ci -qm "added "$ch;
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   190
  > done;
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   191
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   192
  $ hg glog
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   193
  @  4:c41c793e0ef1 added d
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   194
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   195
  o  3:ca1b80f7960a added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   196
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   197
  o  2:b1661037fa25 added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   198
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   199
  o  1:c7586e2a9264 added a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   200
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   201
  o  0:8fa14d15e168 added hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   202
      () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   203
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   204
  $ cd ..
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   205
  $ hg init stackrepo2
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   206
  $ cd stackrepo2
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   207
  $ hg pull ../stackrepo1
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   208
  pulling from ../stackrepo1
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   209
  requesting all changes
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   210
  adding changesets
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   211
  adding manifests
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   212
  adding file changes
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   213
  added 5 changesets with 5 changes to 5 files
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   214
  new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   215
  (run 'hg update' to get a working copy)
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   216
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   217
  $ hg glog
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   218
  o  4:c41c793e0ef1 added d
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   219
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   220
  o  3:ca1b80f7960a added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   221
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   222
  o  2:b1661037fa25 added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   223
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   224
  o  1:c7586e2a9264 added a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   225
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   226
  o  0:8fa14d15e168 added hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   227
      () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   228
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   229
  $ hg up 8fa14d15e168
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   230
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   231
  $ echo newfile > newfile
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   232
  $ hg ci -Am "add newfile"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   233
  adding newfile
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   234
  created new head
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   235
  $ hg rebase -s c7586e2a9264 -d .
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   236
  rebasing 1:c7586e2a9264 "added a"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   237
  rebasing 2:b1661037fa25 "added b"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   238
  rebasing 3:ca1b80f7960a "added c"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   239
  rebasing 4:c41c793e0ef1 "added d"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   240
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   241
  $ hg glog
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   242
  o  9:d45f050514c2 added d
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   243
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   244
  o  8:8ed612937375 added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   245
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   246
  o  7:6eb54b5af3fb added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   247
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   248
  o  6:c04ff147ef79 added a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   249
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   250
  @  5:2228e3b74514 add newfile
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   251
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   252
  o  0:8fa14d15e168 added hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   253
      () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   254
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   255
  $ cd ../stackrepo1
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   256
  $ hg up .^^^
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   257
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   258
  $ echo wat > a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   259
  $ hg amend -m "watbar to a"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   260
  3 new orphan changesets
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   261
  $ hg evolve --all
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   262
  move:[2] added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   263
  atop:[5] watbar to a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   264
  move:[3] added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   265
  move:[4] added d
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   266
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   267
  $ hg glog
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   268
  o  8:c72d2885eb51 added d
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   269
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   270
  o  7:3ce4be6d8e5e added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   271
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   272
  o  6:d5f148423c16 added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   273
  |   () [default] draft
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   274
  @  5:8e222f257bbf watbar to a
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   275
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   276
  o  0:8fa14d15e168 added hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   277
      () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   278
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   279
  $ hg pull ../stackrepo2
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   280
  pulling from ../stackrepo2
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   281
  searching for changes
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   282
  adding changesets
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   283
  adding manifests
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   284
  adding file changes
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   285
  added 5 changesets with 1 changes to 5 files (+1 heads)
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   286
  4 new obsolescence markers
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   287
  8 new content-divergent changesets
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   288
  new changesets 2228e3b74514:d45f050514c2 (5 drafts)
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   289
  (run 'hg heads' to see heads, 'hg merge' to merge)
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   290
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   291
  $ hg glog
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   292
  *  13:d45f050514c2 added d
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   293
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   294
  *  12:8ed612937375 added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   295
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   296
  *  11:6eb54b5af3fb added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   297
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   298
  *  10:c04ff147ef79 added a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   299
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   300
  o  9:2228e3b74514 add newfile
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   301
  |   () [default] draft
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   302
  | *  8:c72d2885eb51 added d
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   303
  | |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   304
  | *  7:3ce4be6d8e5e added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   305
  | |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   306
  | *  6:d5f148423c16 added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   307
  | |   () [default] draft
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   308
  | @  5:8e222f257bbf watbar to a
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   309
  |/    () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   310
  o  0:8fa14d15e168 added hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   311
      () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   312
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   313
  $ hg evolve --all --content-divergent
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   314
  merge:[10] added a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   315
  with: [5] watbar to a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   316
  base: [1] added a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   317
  rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   318
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4442
819bad275701 evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4441
diff changeset
   319
  merge:[11] added b
819bad275701 evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4441
diff changeset
   320
  with: [6] added b
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   321
  base: [2] added b
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   322
  rebasing "divergent" content-divergent changeset 6eb54b5af3fb on 74fbf3e6a0b6
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   323
  rebasing "other" content-divergent changeset d5f148423c16 on 74fbf3e6a0b6
4442
819bad275701 evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4441
diff changeset
   324
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
819bad275701 evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4441
diff changeset
   325
  merge:[12] added c
819bad275701 evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4441
diff changeset
   326
  with: [7] added c
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   327
  base: [3] added c
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   328
  rebasing "divergent" content-divergent changeset 8ed612937375 on 4e29776e83a5
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   329
  rebasing "other" content-divergent changeset 3ce4be6d8e5e on 4e29776e83a5
4442
819bad275701 evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4441
diff changeset
   330
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
819bad275701 evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4441
diff changeset
   331
  merge:[13] added d
819bad275701 evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4441
diff changeset
   332
  with: [8] added d
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   333
  base: [4] added d
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   334
  rebasing "divergent" content-divergent changeset d45f050514c2 on 77126af93a25
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   335
  rebasing "other" content-divergent changeset c72d2885eb51 on 77126af93a25
4442
819bad275701 evolve: add logic to handle a particular case in divergence resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4441
diff changeset
   336
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   337
  working directory is now at 74fbf3e6a0b6
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   338
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   339
  $ hg glog
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   340
  o  24:c8f73c376a6e added d
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   341
  |   () [default] draft
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   342
  o  21:77126af93a25 added c
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   343
  |   () [default] draft
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   344
  o  18:4e29776e83a5 added b
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   345
  |   () [default] draft
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   346
  @  15:74fbf3e6a0b6 watbar to a
4441
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   347
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   348
  o  9:2228e3b74514 add newfile
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   349
  |   () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   350
  o  0:8fa14d15e168 added hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4428
diff changeset
   351
      () [default] draft
5015
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   352
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   353
when "divergent" and "other" both hit merge conflict in relocating
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   354
------------------------------------------------------------------
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   355
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   356
  $ hg strip 14: --hidden
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   357
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   358
  saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/74fbf3e6a0b6-f3612603-backup.hg
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   359
  8 new content-divergent changesets
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   360
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   361
Prepare repo to have merge conflicts
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   362
  $ hg up -r "max(desc('added a'))"
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   363
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   364
  $ hg evolve -r . --content-divergent
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   365
  merge:[10] added a
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   366
  with: [5] watbar to a
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   367
  base: [1] added a
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   368
  rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   369
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   370
  6 new orphan changesets
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   371
  working directory is now at 74fbf3e6a0b6
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   372
  $ echo b_conflict > b
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   373
  $ hg amend -A
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   374
  adding b
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   375
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   376
Let's try to evolve stack
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   377
  $ hg evolve --content-divergent
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   378
  merge:[11] added b
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   379
  with: [6] added b
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   380
  base: [2] added b
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   381
  rebasing "divergent" content-divergent changeset 6eb54b5af3fb on 119989a4317e
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   382
  merging b
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   383
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   384
  unresolved merge conflicts
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   385
  (see 'hg help evolve.interrupted')
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   386
  [1]
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   387
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   388
  $ echo b > b
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   389
  $ hg res -m
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   390
  (no more unresolved files)
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   391
  continue: hg evolve --continue
5016
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   392
  $ hg evolve --continue
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   393
  evolving 11:6eb54b5af3fb "added b"
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   394
  rebasing "other" content-divergent changeset d5f148423c16 on 119989a4317e
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   395
  merging b
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   396
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   397
  unresolved merge conflicts
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   398
  (see 'hg help evolve.interrupted')
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   399
  [1]
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   400
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   401
  $ echo b > b
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   402
  $ hg res -m
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   403
  (no more unresolved files)
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   404
  continue: hg evolve --continue
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   405
  $ hg evolve --continue
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   406
  evolving 6:d5f148423c16 "added b"
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   407
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   408
  merge:[12] added c
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   409
  with: [7] added c
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   410
  base: [3] added c
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   411
  rebasing "divergent" content-divergent changeset 8ed612937375 on 646bd3372ee7
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   412
  rebasing "other" content-divergent changeset 3ce4be6d8e5e on 646bd3372ee7
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   413
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   414
  merge:[13] added d
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   415
  with: [8] added d
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   416
  base: [4] added d
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   417
  rebasing "divergent" content-divergent changeset d45f050514c2 on 67abc597e636
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   418
  rebasing "other" content-divergent changeset c72d2885eb51 on 67abc597e636
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   419
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   420
  working directory is now at 119989a4317e
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   421
  $ hg glog
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   422
  o  25:5e2572194f59 added d
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   423
  |   () [default] draft
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   424
  o  22:67abc597e636 added c
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   425
  |   () [default] draft
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   426
  o  19:646bd3372ee7 added b
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   427
  |   () [default] draft
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   428
  @  16:119989a4317e watbar to a
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   429
  |   () [default] draft
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   430
  o  9:2228e3b74514 add newfile
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   431
  |   () [default] draft
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   432
  o  0:8fa14d15e168 added hgignore
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   433
      () [default] draft
5015
43f4784a3f21 evolve: add test for `--continue` case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4993
diff changeset
   434
4419
1fdecdfd0df9 evolve: add test which shows unrecoverable evolve state (issue6053)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4181
diff changeset
   435
  $ cd ..
4990
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   436
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   437
Make sure that content-divergent resolution doesn't undo a change (issue6203)
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   438
-----------------------------------------------------------------------------
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   439
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   440
  $ hg init issue6203
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   441
  $ cd issue6203
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   442
  $ echo a > a; hg add a; hg ci -m a
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   443
  $ echo 'b with typo' > b; hg add b; hg ci -m b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   444
  $ echo c > c; hg add c; hg ci -m c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   445
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   446
  $ hg prev
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   447
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   448
  [1] b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   449
  $ echo 'b without typo' > b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   450
  $ hg amend
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   451
  1 new orphan changesets
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   452
  $ hg evolve
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   453
  move:[2] c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   454
  atop:[3] b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   455
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   456
  $ hg up 0
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   457
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   458
  $ echo d > d; hg add d; hg ci -m d
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   459
  created new head
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   460
  $ hg rebase --hidden --config experimental.evolution.allowdivergence=True -s 1 -d 5
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   461
  rebasing 1:d420a663b65e "b"
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   462
  rebasing 2:49f182e7a6cc "c"
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   463
  4 new content-divergent changesets
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   464
  $ hg log -G -v --patch
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   465
  *  changeset:   7:ef4885dea3da
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   466
  |  tag:         tip
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   467
  |  user:        test
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   468
  |  date:        Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   469
  |  instability: content-divergent
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   470
  |  files:       c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   471
  |  description:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   472
  |  c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   473
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   474
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   475
  |  diff -r fe788ccf5416 -r ef4885dea3da c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   476
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   477
  |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   478
  |  @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   479
  |  +c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   480
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   481
  *  changeset:   6:fe788ccf5416
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   482
  |  user:        test
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   483
  |  date:        Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   484
  |  instability: content-divergent
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   485
  |  files:       b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   486
  |  description:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   487
  |  b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   488
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   489
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   490
  |  diff -r 980f7dc84c29 -r fe788ccf5416 b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   491
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   492
  |  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   493
  |  @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   494
  |  +b with typo
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   495
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   496
  @  changeset:   5:980f7dc84c29
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   497
  |  parent:      0:cb9a9f314b8b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   498
  |  user:        test
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   499
  |  date:        Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   500
  |  files:       d
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   501
  |  description:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   502
  |  d
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   503
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   504
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   505
  |  diff -r cb9a9f314b8b -r 980f7dc84c29 d
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   506
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   507
  |  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   508
  |  @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   509
  |  +d
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   510
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   511
  | *  changeset:   4:fef59171875e
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   512
  | |  user:        test
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   513
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   514
  | |  instability: content-divergent
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   515
  | |  files:       c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   516
  | |  description:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   517
  | |  c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   518
  | |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   519
  | |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   520
  | |  diff -r 5b2d00df9c4e -r fef59171875e c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   521
  | |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   522
  | |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   523
  | |  @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   524
  | |  +c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   525
  | |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   526
  | *  changeset:   3:5b2d00df9c4e
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   527
  |/   parent:      0:cb9a9f314b8b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   528
  |    user:        test
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   529
  |    date:        Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   530
  |    instability: content-divergent
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   531
  |    files:       b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   532
  |    description:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   533
  |    b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   534
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   535
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   536
  |    diff -r cb9a9f314b8b -r 5b2d00df9c4e b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   537
  |    --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   538
  |    +++ b/b	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   539
  |    @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   540
  |    +b without typo
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   541
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   542
  o  changeset:   0:cb9a9f314b8b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   543
     user:        test
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   544
     date:        Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   545
     files:       a
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   546
     description:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   547
     a
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   548
  
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   549
  
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   550
     diff -r 000000000000 -r cb9a9f314b8b a
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   551
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   552
     +++ b/a	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   553
     @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   554
     +a
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   555
  
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   556
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   557
  $ hg evolve --content-divergent
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   558
  merge:[6] b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   559
  with: [3] b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   560
  base: [1] b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   561
  rebasing "other" content-divergent changeset 5b2d00df9c4e on 980f7dc84c29
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   562
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   563
  merge:[7] c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   564
  with: [4] c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   565
  base: [2] c
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   566
  rebasing "divergent" content-divergent changeset ef4885dea3da on 0999c349998d
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   567
  rebasing "other" content-divergent changeset fef59171875e on 0999c349998d
4990
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   568
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   569
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   570
Expected result:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   571
Changeset with description "b" only adds file "b" with content "b without typo".
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   572
Changeset with description "c" only adds file "c" with content "c".
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   573
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   574
  $ hg glog -l2 -p
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   575
  o  12:4ca627f76da9 c
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4990
diff changeset
   576
  |   () [default] draftdiff -r 0999c349998d -r 4ca627f76da9 c
4990
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   577
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   578
  |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   579
  |  @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   580
  |  +c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   581
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   582
  o  9:0999c349998d b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   583
  |   () [default] draftdiff -r 980f7dc84c29 -r 0999c349998d b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   584
  ~  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   585
     +++ b/b	Thu Jan 01 00:00:00 1970 +0000
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   586
     @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   587
     +b without typo
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   588
  
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   589
  $ cd ..
4993
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   590
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   591
Testing case when resolution parent is ambiguous (MultipleSuccessorsError)
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   592
--------------------------------------------------------------------------
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   593
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   594
  $ hg init multiplesuccs1
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   595
  $ cd multiplesuccs1
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   596
  $ echo base > base
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   597
  $ hg ci -Aqm "added base"
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   598
  $ echo foo > foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   599
  $ hg ci -Aqm "added foo"
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   600
  $ echo bar > bar; echo car > car
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   601
  $ hg ci -Aqm "added bar and car"
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   602
  $ echo dar > dar
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   603
  $ hg ci -Aqm "added dar"
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   604
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   605
  $ cd ..
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   606
  $ hg clone multiplesuccs1 multiplesuccs2
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   607
  updating to branch default
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   608
  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   609
  $ cd multiplesuccs2
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   610
  $ hg up -r "desc('added foo')"
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   611
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   612
  $ echo newfoo > foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   613
  $ hg amend
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   614
  2 new orphan changesets
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   615
  $ hg evolve
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   616
  move:[2] added bar and car
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   617
  atop:[4] added foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   618
  move:[3] added dar
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   619
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   620
  $ cd ../multiplesuccs1
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   621
  $ hg up -r "desc('added base')"
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   622
  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   623
  $ echo tuna > tuna
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   624
  $ hg ci -Aqm "added tuna"
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   625
  $ hg rebase -s "desc('added foo')" -d .
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   626
  rebasing 1:8da7bbaea4f7 "added foo"
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   627
  rebasing 2:7f4b97b13607 "added bar and car"
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   628
  rebasing 3:9f12b2fcb3de "added dar"
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   629
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   630
  $ cd ../multiplesuccs2
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   631
  $ hg pull
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   632
  pulling from $TESTTMP/multiplesuccs1
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   633
  searching for changes
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   634
  adding changesets
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   635
  adding manifests
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   636
  adding file changes
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   637
  added 4 changesets with 1 changes to 5 files (+1 heads)
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   638
  3 new obsolescence markers
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   639
  6 new content-divergent changesets
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   640
  new changesets 9703820a7d5b:9a1f460df8b5 (4 drafts)
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   641
  (run 'hg heads' to see heads, 'hg merge' to merge)
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   642
  $ hg glog
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   643
  *  10:9a1f460df8b5 added dar
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   644
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   645
  *  9:7dd5b9d42ef3 added bar and car
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   646
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   647
  *  8:afd8b2ea1b77 added foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   648
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   649
  o  7:9703820a7d5b added tuna
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   650
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   651
  | *  6:57a3f8edf065 added dar
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   652
  | |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   653
  | *  5:f4ed107810a7 added bar and car
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   654
  | |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   655
  | @  4:8a2d93492f59 added foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   656
  |/    () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   657
  o  0:bde1d2b6b5e5 added base
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   658
      () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   659
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   660
  $ hg evolve -r 4+5 --content-divergent
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   661
  merge:[8] added foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   662
  with: [4] added foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   663
  base: [1] added foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   664
  rebasing "other" content-divergent changeset 8a2d93492f59 on 9703820a7d5b
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   665
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   666
  merge:[9] added bar and car
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   667
  with: [5] added bar and car
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   668
  base: [2] added bar and car
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   669
  rebasing "divergent" content-divergent changeset 7dd5b9d42ef3 on 8ef6ad88580d
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   670
  rebasing "other" content-divergent changeset f4ed107810a7 on 8ef6ad88580d
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   671
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   672
  2 new orphan changesets
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   673
  working directory is now at 8ef6ad88580d
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   674
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   675
  $ hg glog
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   676
  o  15:09ba686a465e added bar and car
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   677
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   678
  @  12:8ef6ad88580d added foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   679
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   680
  | *  10:9a1f460df8b5 added dar
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   681
  | |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   682
  | x  9:7dd5b9d42ef3 added bar and car
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   683
  | |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   684
  | x  8:afd8b2ea1b77 added foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   685
  |/    () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   686
  o  7:9703820a7d5b added tuna
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   687
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   688
  | *  6:57a3f8edf065 added dar
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   689
  | |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   690
  | x  5:f4ed107810a7 added bar and car
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   691
  | |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   692
  | x  4:8a2d93492f59 added foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   693
  |/    () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   694
  o  0:bde1d2b6b5e5 added base
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   695
      () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   696
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   697
  $ echo bar > bar; hg ci -Aqm "added bar"
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   698
  $ echo car > car; hg ci -Aqm "added car"
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   699
  $ hg prune --split -s 16+17 -r 15
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   700
  1 changesets pruned
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   701
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   702
  $ hg evolve --content-divergent
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   703
  skipping 57a3f8edf065: have a different parent than 9a1f460df8b5 (not handled yet)
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   704
  | 57a3f8edf065, 9a1f460df8b5 are not based on the same changeset.
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   705
  | With the current state of its implementation, 
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   706
  | evolve does not work in that case.
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   707
  | rebase one of them next to the other and run 
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   708
  | this command again.
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   709
  | - either: hg rebase --dest 'p1(57a3f8edf065)' -r 9a1f460df8b5
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   710
  | - or:     hg rebase --dest 'p1(9a1f460df8b5)' -r 57a3f8edf065