tests/test-evolve-content-divergent-stack.t
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 30 Apr 2020 10:05:14 -0700
changeset 5341 13376ca93fa3
parent 5123 900668a93629
child 5344 142827ad86f3
permissions -rw-r--r--
evolve: always create commit when resolving divergence When resolving content-divergence, the final commit we create may end up empty (which means that Mercurial won't even create it). We've had code for handling that in evolve ever since 41bf6c27a122 (evolve: stabilize now handle conflicting changeset, 2012-08-23). However, that resolved the issue by marking on the divergent commits as successor. As Pierre-Yves has pointed out (in other code reviews), we should instead be creating a new successor. So that's what this patch does. It does that by setting `ui.allowemptycommit` while creating the final commit. However, that is not enough, because we may end up creating the same nodeid as already existed (we'd then end up trying to mark the "new" commit a successor of itself). To solve that, we add some salt to the commit extras. That salt affects lots of tests.
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   151
  rebasing "divergent" content-divergent changeset d5f148423c16 on f9ec70805963
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   156
  rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on fa0055a90894
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   161
  rebasing "divergent" content-divergent changeset c72d2885eb51 on 0b6449a7ad07
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   163
  working directory is now at f9ec70805963
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   166
  o  19:2b48850357ee 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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   168
  o  17:0b6449a7ad07 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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   170
  o  15:fa0055a90894 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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   172
  @  13:f9ec70805963 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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   322
  rebasing "divergent" content-divergent changeset 6eb54b5af3fb on c68b60ab6619
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   323
  rebasing "other" content-divergent changeset d5f148423c16 on c68b60ab6619
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   328
  rebasing "divergent" content-divergent changeset 8ed612937375 on ff90e9515d17
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   329
  rebasing "other" content-divergent changeset 3ce4be6d8e5e on ff90e9515d17
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   334
  rebasing "divergent" content-divergent changeset d45f050514c2 on 4270af019ebe
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   335
  rebasing "other" content-divergent changeset c72d2885eb51 on 4270af019ebe
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   337
  working directory is now at c68b60ab6619
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   340
  o  24:78efb5c9d581 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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   342
  o  21:4270af019ebe 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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   344
  o  18:ff90e9515d17 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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   346
  @  15:c68b60ab6619 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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   358
  saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/c68b60ab6619-a957686d-backup.hg
5015
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   371
  working directory is now at c68b60ab6619
5015
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   381
  rebasing "divergent" content-divergent changeset 6eb54b5af3fb on 1a1d3f0cfe5a
5015
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"
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   394
  rebasing "other" content-divergent changeset d5f148423c16 on 1a1d3f0cfe5a
5016
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   411
  rebasing "divergent" content-divergent changeset 8ed612937375 on 58f146beb59b
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   412
  rebasing "other" content-divergent changeset 3ce4be6d8e5e on 58f146beb59b
5016
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   417
  rebasing "divergent" content-divergent changeset d45f050514c2 on 6f6ca0d5d239
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   418
  rebasing "other" content-divergent changeset c72d2885eb51 on 6f6ca0d5d239
5016
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
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   420
  working directory is now at 1a1d3f0cfe5a
5016
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   421
  $ hg glog
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   422
  o  25:b8c8157a53cd added d
5016
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   423
  |   () [default] draft
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   424
  o  22:6f6ca0d5d239 added c
5016
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   425
  |   () [default] draft
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   426
  o  19:58f146beb59b added b
5016
64868b7dc112 evolve: add logic to cover --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5015
diff changeset
   427
  |   () [default] draft
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   428
  @  16:1a1d3f0cfe5a watbar to a
5016
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
5018
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   435
when relocating "other" hit merge conflict but not "divergent"
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   436
--------------------------------------------------------------
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   437
  $ hg strip 14: --hidden
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   438
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   439
  saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/c68b60ab6619-3384c553-backup.hg
5018
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   440
  8 new content-divergent changesets
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   441
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   442
Insert conflicting changes in between the stack of content-div csets
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   443
  $ hg up -r "max(desc('added b'))"
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   444
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   445
  $ echo b_diverging_local > b
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   446
  $ hg amend
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   447
  2 new orphan changesets
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   448
  $ hg evolve
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   449
  move:[12] added c
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   450
  atop:[14] added b
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   451
  move:[13] added d
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   452
  $ hg up -r d5f148423c16
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   453
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   454
  $ echo b_diverging_other > b
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   455
  $ hg amend
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   456
  2 new orphan changesets
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   457
  $ hg evolve
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   458
  move:[7] added c
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   459
  atop:[17] added b
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   460
  move:[8] added d
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   461
5027
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   462
  $ hg log -r tip
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   463
  changeset:   19:c351be27f199
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   464
  tag:         tip
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   465
  user:        test
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   466
  date:        Thu Jan 01 00:00:00 1970 +0000
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   467
  instability: content-divergent
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   468
  summary:     added d
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   469
  
5018
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   470
Now let's try to evolve stack
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   471
  $ hg evolve --content-divergent
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   472
  merge:[10] added a
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   473
  with: [5] watbar to a
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   474
  base: [1] added a
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   475
  rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   476
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   477
  merge:[14] added b
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   478
  with: [17] added b
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   479
  base: [2] added b
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   480
  rebasing "divergent" content-divergent changeset 2a955e808c53 on c68b60ab6619
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   481
  rebasing "other" content-divergent changeset 509103439e5e on c68b60ab6619
5018
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   482
  merging b
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   483
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   484
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   485
  4 new orphan changesets
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   486
  unresolved merge conflicts
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   487
  (see 'hg help evolve.interrupted')
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   488
  [1]
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   489
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   490
As now we have interrupted evolution of stack of content-divergent cset (when
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   491
relocation of "divergent" also included) let's test --abort and --stop 
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   492
test --abort:
5027
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   493
  $ hg evolve --abort
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   494
  2 new content-divergent changesets
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   495
  evolve aborted
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   496
  working directory is now at 509103439e5e
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   497
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   498
confirm that tip is same as it was before we started --content-div resolution
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   499
  $ hg log -r tip
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   500
  changeset:   19:c351be27f199
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   501
  tag:         tip
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   502
  user:        test
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   503
  date:        Thu Jan 01 00:00:00 1970 +0000
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   504
  instability: content-divergent
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   505
  summary:     added d
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   506
  
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   507
test --stop:
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   508
  $ hg log -G
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   509
  *  changeset:   19:c351be27f199
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   510
  |  tag:         tip
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   511
  |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   512
  |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   513
  |  instability: content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   514
  |  summary:     added d
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   515
  |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   516
  *  changeset:   18:eaf34afe4df3
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   517
  |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   518
  |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   519
  |  instability: content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   520
  |  summary:     added c
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   521
  |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   522
  @  changeset:   17:509103439e5e
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   523
  |  parent:      5:8e222f257bbf
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   524
  |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   525
  |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   526
  |  instability: content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   527
  |  summary:     added b
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   528
  |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   529
  | *  changeset:   16:91c8ccb9c241
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   530
  | |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   531
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   532
  | |  instability: content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   533
  | |  summary:     added d
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   534
  | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   535
  | *  changeset:   15:48b0f803817a
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   536
  | |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   537
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   538
  | |  instability: content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   539
  | |  summary:     added c
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   540
  | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   541
  | *  changeset:   14:2a955e808c53
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   542
  | |  parent:      10:c04ff147ef79
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   543
  | |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   544
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   545
  | |  instability: content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   546
  | |  summary:     added b
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   547
  | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   548
  | *  changeset:   10:c04ff147ef79
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   549
  | |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   550
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   551
  | |  instability: content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   552
  | |  summary:     added a
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   553
  | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   554
  | o  changeset:   9:2228e3b74514
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   555
  | |  parent:      0:8fa14d15e168
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   556
  | |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   557
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   558
  | |  summary:     add newfile
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   559
  | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   560
  * |  changeset:   5:8e222f257bbf
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   561
  |/   parent:      0:8fa14d15e168
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   562
  |    user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   563
  |    date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   564
  |    instability: content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   565
  |    summary:     watbar to a
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   566
  |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   567
  o  changeset:   0:8fa14d15e168
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   568
     user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   569
     date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   570
     summary:     added hgignore
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   571
  
5027
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   572
  $ hg evolve --content-divergent
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   573
  merge:[10] added a
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   574
  with: [5] watbar to a
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   575
  base: [1] added a
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   576
  rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   577
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   578
  merge:[14] added b
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   579
  with: [17] added b
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   580
  base: [2] added b
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   581
  rebasing "divergent" content-divergent changeset 2a955e808c53 on c68b60ab6619
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   582
  rebasing "other" content-divergent changeset 509103439e5e on c68b60ab6619
5027
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   583
  merging b
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   584
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   585
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   586
  4 new orphan changesets
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   587
  unresolved merge conflicts
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   588
  (see 'hg help evolve.interrupted')
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   589
  [1]
08be8a4d5196 evolve: add test to show that --abort is working fine
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5018
diff changeset
   590
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   591
  $ hg evolve --stop
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   592
  2 new orphan changesets
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   593
  stopped the interrupted evolve
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   594
  working directory is now at 2a955e808c53
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   595
  $ hg log -G
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   596
  o  changeset:   21:c68b60ab6619
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   597
  |  tag:         tip
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   598
  |  parent:      9:2228e3b74514
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   599
  |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   600
  |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   601
  |  summary:     watbar to a
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   602
  |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   603
  | *  changeset:   19:c351be27f199
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   604
  | |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   605
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   606
  | |  instability: orphan, content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   607
  | |  summary:     added d
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   608
  | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   609
  | *  changeset:   18:eaf34afe4df3
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   610
  | |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   611
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   612
  | |  instability: orphan, content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   613
  | |  summary:     added c
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   614
  | |
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   615
  | *  changeset:   17:509103439e5e
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   616
  | |  parent:      5:8e222f257bbf
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   617
  | |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   618
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   619
  | |  instability: orphan, content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   620
  | |  summary:     added b
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   621
  | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   622
  | | *  changeset:   16:91c8ccb9c241
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   623
  | | |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   624
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   625
  | | |  instability: orphan, content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   626
  | | |  summary:     added d
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   627
  | | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   628
  | | *  changeset:   15:48b0f803817a
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   629
  | | |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   630
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   631
  | | |  instability: orphan, content-divergent
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   632
  | | |  summary:     added c
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   633
  | | |
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   634
  | | @  changeset:   14:2a955e808c53
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   635
  | | |  parent:      10:c04ff147ef79
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   636
  | | |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   637
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   638
  | | |  instability: orphan, content-divergent
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   639
  | | |  summary:     added b
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   640
  | | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   641
  +---x  changeset:   10:c04ff147ef79
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   642
  | |    user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   643
  | |    date:        Thu Jan 01 00:00:00 1970 +0000
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   644
  | |    obsolete:    rewritten using evolve as 21:c68b60ab6619
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   645
  | |    summary:     added a
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   646
  | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   647
  o |  changeset:   9:2228e3b74514
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   648
  | |  parent:      0:8fa14d15e168
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   649
  | |  user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   650
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   651
  | |  summary:     add newfile
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   652
  | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   653
  | x  changeset:   5:8e222f257bbf
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   654
  |/   parent:      0:8fa14d15e168
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   655
  |    user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   656
  |    date:        Thu Jan 01 00:00:00 1970 +0000
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   657
  |    obsolete:    rewritten using evolve as 21:c68b60ab6619
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   658
  |    summary:     watbar to a
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   659
  |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   660
  o  changeset:   0:8fa14d15e168
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   661
     user:        test
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   662
     date:        Thu Jan 01 00:00:00 1970 +0000
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   663
     summary:     added hgignore
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   664
  
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   665
  $ hg obslog -r 'desc("watbar to a")' --all
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   666
  o    c68b60ab6619 (21) watbar to a
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   667
  |\
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   668
  x |  186bdc2cdfa2 (20) watbar to a
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   669
  | |    meta-changed(meta) as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   670
  | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   671
  | x  c04ff147ef79 (10) added a
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   672
  | |    rewritten(description, meta, content) as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   673
  | |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   674
  x |  8e222f257bbf (5) watbar to a
5123
900668a93629 obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents: 5029
diff changeset
   675
  |/     rebased(parent) as 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   676
  |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   677
  x  c7586e2a9264 (1) added a
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   678
       rewritten(description, content) as 8e222f257bbf using amend by test (Thu Jan 01 00:00:00 1970 +0000)
5123
900668a93629 obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents: 5029
diff changeset
   679
       rebased(parent) as c04ff147ef79 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   680
  
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   681
  $ hg obslog -r 'desc("added b")' --all
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   682
  @  2a955e808c53 (14) added b
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   683
  |
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   684
  | *  509103439e5e (17) added b
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   685
  | |
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   686
  x |  6eb54b5af3fb (11) added b
5123
900668a93629 obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents: 5029
diff changeset
   687
  | |    amended(content) as 2a955e808c53 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   688
  | |
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   689
  | x  d5f148423c16 (6) added b
5123
900668a93629 obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents: 5029
diff changeset
   690
  |/     amended(content) as 509103439e5e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   691
  |
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   692
  x  b1661037fa25 (2) added b
5123
900668a93629 obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents: 5029
diff changeset
   693
       rebased(parent) as 6eb54b5af3fb using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
900668a93629 obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents: 5029
diff changeset
   694
       rebased(parent) as d5f148423c16 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   695
  
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   696
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   697
Again, let's evolve the stack
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   698
  $ hg evolve --content-divergent
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   699
  merge:[14] added b
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   700
  with: [17] added b
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   701
  base: [2] added b
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   702
  rebasing "divergent" content-divergent changeset 2a955e808c53 on c68b60ab6619
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   703
  rebasing "other" content-divergent changeset 509103439e5e on c68b60ab6619
5028
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   704
  merging b
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   705
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   706
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   707
  unresolved merge conflicts
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   708
  (see 'hg help evolve.interrupted')
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   709
  [1]
109889c7d02d evolve: test to show that --stop is not working when "divergent" relocated
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5027
diff changeset
   710
5018
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   711
  $ echo foo > b
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   712
  $ hg res -m
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   713
  (no more unresolved files)
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   714
  continue: hg evolve --continue
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   715
  $ hg evolve --continue
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   716
  merge:[15] added c
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   717
  with: [18] added c
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   718
  base: [3] added c
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   719
  rebasing "divergent" content-divergent changeset 48b0f803817a on f51f02e0d589
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   720
  rebasing "other" content-divergent changeset eaf34afe4df3 on f51f02e0d589
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   721
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   722
  merge:[16] added d
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   723
  with: [19] added d
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   724
  base: [4] added d
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   725
  rebasing "divergent" content-divergent changeset 91c8ccb9c241 on f0edb9305414
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   726
  rebasing "other" content-divergent changeset c351be27f199 on f0edb9305414
5029
421b295e32b4 evolve: add logic to cover --stop when "divergent" relocation in play
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5028
diff changeset
   727
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   728
  working directory is now at f51f02e0d589
5018
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   729
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   730
  $ hg evolve -l
f1e90ce1d372 evolve: add more tests for --continue case when relocating "divergent"
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5016
diff changeset
   731
4419
1fdecdfd0df9 evolve: add test which shows unrecoverable evolve state (issue6053)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4181
diff changeset
   732
  $ cd ..
4990
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   733
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   734
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
   735
-----------------------------------------------------------------------------
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   736
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   737
  $ hg init issue6203
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   738
  $ cd issue6203
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   739
  $ 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
   740
  $ 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
   741
  $ 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
   742
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   743
  $ hg prev
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   744
  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
   745
  [1] b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   746
  $ echo 'b without typo' > b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   747
  $ hg amend
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   748
  1 new orphan changesets
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   749
  $ hg evolve
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   750
  move:[2] c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   751
  atop:[3] b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   752
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   753
  $ hg up 0
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   754
  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
   755
  $ 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
   756
  created new head
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   757
  $ 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
   758
  rebasing 1:d420a663b65e "b"
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   759
  rebasing 2:49f182e7a6cc "c"
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   760
  4 new content-divergent changesets
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   761
  $ hg log -G -v --patch
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   762
  *  changeset:   7:ef4885dea3da
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   763
  |  tag:         tip
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   764
  |  user:        test
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   765
  |  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
   766
  |  instability: content-divergent
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   767
  |  files:       c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   768
  |  description:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   769
  |  c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   770
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   771
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   772
  |  diff -r fe788ccf5416 -r ef4885dea3da c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   773
  |  --- /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
   774
  |  +++ 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
   775
  |  @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   776
  |  +c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   777
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   778
  *  changeset:   6:fe788ccf5416
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   779
  |  user:        test
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   780
  |  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
   781
  |  instability: content-divergent
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   782
  |  files:       b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   783
  |  description:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   784
  |  b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   785
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   786
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   787
  |  diff -r 980f7dc84c29 -r fe788ccf5416 b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   788
  |  --- /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
   789
  |  +++ 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
   790
  |  @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   791
  |  +b with typo
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   792
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   793
  @  changeset:   5:980f7dc84c29
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   794
  |  parent:      0:cb9a9f314b8b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   795
  |  user:        test
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   796
  |  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
   797
  |  files:       d
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   798
  |  description:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   799
  |  d
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   800
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   801
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   802
  |  diff -r cb9a9f314b8b -r 980f7dc84c29 d
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   803
  |  --- /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
   804
  |  +++ 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
   805
  |  @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   806
  |  +d
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   807
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   808
  | *  changeset:   4:fef59171875e
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   809
  | |  user:        test
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   810
  | |  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
   811
  | |  instability: content-divergent
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   812
  | |  files:       c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   813
  | |  description:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   814
  | |  c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   815
  | |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   816
  | |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   817
  | |  diff -r 5b2d00df9c4e -r fef59171875e c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   818
  | |  --- /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
   819
  | |  +++ 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
   820
  | |  @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   821
  | |  +c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   822
  | |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   823
  | *  changeset:   3:5b2d00df9c4e
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   824
  |/   parent:      0:cb9a9f314b8b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   825
  |    user:        test
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   826
  |    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
   827
  |    instability: content-divergent
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   828
  |    files:       b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   829
  |    description:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   830
  |    b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   831
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   832
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   833
  |    diff -r cb9a9f314b8b -r 5b2d00df9c4e b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   834
  |    --- /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
   835
  |    +++ 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
   836
  |    @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   837
  |    +b without typo
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   838
  |
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   839
  o  changeset:   0:cb9a9f314b8b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   840
     user:        test
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   841
     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
   842
     files:       a
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   843
     description:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   844
     a
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   845
  
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   846
  
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   847
     diff -r 000000000000 -r cb9a9f314b8b a
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   848
     --- /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
   849
     +++ 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
   850
     @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   851
     +a
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   852
  
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   853
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   854
  $ hg evolve --content-divergent
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   855
  merge:[6] b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   856
  with: [3] b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   857
  base: [1] b
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   858
  rebasing "other" content-divergent changeset 5b2d00df9c4e on 980f7dc84c29
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   859
  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
   860
  merge:[7] c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   861
  with: [4] c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   862
  base: [2] c
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   863
  rebasing "divergent" content-divergent changeset ef4885dea3da on 744161d6411b
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   864
  rebasing "other" content-divergent changeset fef59171875e on 744161d6411b
4990
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   865
  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
   866
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   867
Expected result:
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   868
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
   869
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
   870
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   871
  $ hg glog -l2 -p
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   872
  o  12:4f07c2bae326 c
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   873
  |   () [default] draftdiff -r 744161d6411b -r 4f07c2bae326 c
4990
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   874
  |  --- /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
   875
  |  +++ 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
   876
  |  @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   877
  |  +c
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   878
  |
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   879
  o  9:744161d6411b b
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   880
  |   () [default] draftdiff -r 980f7dc84c29 -r 744161d6411b b
4990
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   881
  ~  --- /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
   882
     +++ 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
   883
     @@ -0,0 +1,1 @@
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   884
     +b without typo
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   885
  
f3fd3c1c3da0 evolve: add test to demonstrate issue6203
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   886
  $ cd ..
4993
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   887
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   888
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
   889
--------------------------------------------------------------------------
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   890
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   891
  $ hg init multiplesuccs1
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   892
  $ cd multiplesuccs1
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   893
  $ echo base > base
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   894
  $ 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
   895
  $ echo foo > foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   896
  $ 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
   897
  $ 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
   898
  $ 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
   899
  $ echo dar > dar
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   900
  $ 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
   901
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   902
  $ cd ..
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   903
  $ 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
   904
  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
   905
  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
   906
  $ cd multiplesuccs2
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   907
  $ 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
   908
  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
   909
  $ echo newfoo > foo
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   910
  $ hg amend
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   911
  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
   912
  $ hg evolve
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   913
  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
   914
  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
   915
  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
   916
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   917
  $ cd ../multiplesuccs1
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   918
  $ 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
   919
  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
   920
  $ echo tuna > tuna
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   921
  $ 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
   922
  $ 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
   923
  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
   924
  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
   925
  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
   926
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   927
  $ cd ../multiplesuccs2
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   928
  $ hg pull
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   929
  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
   930
  searching for changes
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   931
  adding changesets
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   932
  adding manifests
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   933
  adding file changes
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   934
  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
   935
  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
   936
  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
   937
  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
   938
  (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
   939
  $ hg glog
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   940
  *  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
   941
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   942
  *  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
   943
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   944
  *  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
   945
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   946
  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
   947
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   948
  | *  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
   949
  | |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   950
  | *  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
   951
  | |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   952
  | @  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
   953
  |/    () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   954
  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
   955
      () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   956
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   957
  $ 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
   958
  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
   959
  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
   960
  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
   961
  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
   962
  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
   963
  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
   964
  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
   965
  base: [2] added bar and car
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   966
  rebasing "divergent" content-divergent changeset 7dd5b9d42ef3 on 79e1386ae402
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   967
  rebasing "other" content-divergent changeset f4ed107810a7 on 79e1386ae402
4993
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   968
  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
   969
  2 new orphan changesets
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   970
  working directory is now at 79e1386ae402
4993
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   971
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   972
  $ hg glog
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   973
  o  15:f0a0eeecf543 added bar and car
4993
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   974
  |   () [default] draft
5341
13376ca93fa3 evolve: always create commit when resolving divergence
Martin von Zweigbergk <martinvonz@google.com>
parents: 5123
diff changeset
   975
  @  12:79e1386ae402 added foo
4993
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   976
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   977
  | *  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
   978
  | |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   979
  | 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
   980
  | |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   981
  | 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
   982
  |/    () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   983
  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
   984
  |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   985
  | *  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
   986
  | |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   987
  | 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
   988
  | |   () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   989
  | 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
   990
  |/    () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   991
  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
   992
      () [default] draft
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   993
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   994
  $ 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
   995
  $ 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
   996
  $ 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
   997
  1 changesets pruned
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   998
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
   999
  $ 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
  1000
  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
  1001
  | 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
  1002
  | 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
  1003
  | 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
  1004
  | 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
  1005
  | this command again.
e0b5ce458af5 evolve: add tests for the case when resolution parent is ambiguous
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4991
diff changeset
  1006
  | - 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
  1007
  | - or:     hg rebase --dest 'p1(9a1f460df8b5)' -r 57a3f8edf065