tests/test-evolve-continue.t
author Pulkit Goyal <7895pulkit@gmail.com>
Wed, 23 May 2018 02:33:14 +0530
changeset 3754 73ee40cbfb53
parent 3702 f6979d64b9fb
child 3714 19ec729f3ca2
child 3796 ededd22e7c7b
permissions -rw-r--r--
evolve: return the new replacement node to be stored in evolvestate While resolving phase-divergence, we can end up obsoleting the phase-divergent commit in favor of the public commit. Before this patch we return the node of public commit to store as a replacement of the phase-divergent commit. The above will not cause any problem till the time we use `hg evolve --abort` on an interrupted evolve which tries to strip the replacement nodes because it thinks that the replacements nodes are the ones which are created during the resolution and are new. Since we will be stripping a public node, `evolve --abort` will error out saying cannot strip public changeset, unable to abort evolve which is bad. We should make sure, replacements should only consist of new nodes formed. If the instablity is resolved by obsoleting in favour of old changeset, we should not store the old changeset in replacements in evolvestate.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3489
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     1
Testing the continue functionality of `hg evolve`
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     2
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     3
  $ cat >> $HGRCPATH <<EOF
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     4
  > [ui]
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     5
  > interactive = True
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     6
  > [alias]
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     7
  > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     8
  > [extensions]
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     9
  > rebase =
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    10
  > EOF
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    11
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    12
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    13
Setting up the repo
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    14
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    15
  $ hg init repo
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    16
  $ cd repo
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    17
  $ echo ".*\.orig" > .hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    18
  $ hg add .hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    19
  $ hg ci -m "added hgignore"
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    20
  $ for ch in a b c d; do echo foo>$ch; hg add $ch; hg ci -qm "added "$ch; done
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    21
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    22
  $ hg glog
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    23
  @  4:c41c793e0ef1 added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    24
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    25
  o  3:ca1b80f7960a added c
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    26
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    27
  o  2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    28
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    29
  o  1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    30
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    31
  o  0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    32
      () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    33
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    34
Simple case of evolve --continue
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    35
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    36
  $ hg up ca1b80f7960a
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    37
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    38
  $ echo bar > d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    39
  $ hg add d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    40
  $ hg amend
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    41
  1 new orphan changesets
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    42
  $ hg glog
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    43
  @  5:cb6a2ab625bb added c
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    44
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    45
  | *  4:c41c793e0ef1 added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    46
  | |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    47
  | x  3:ca1b80f7960a added c
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    48
  |/    () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    49
  o  2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    50
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    51
  o  1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    52
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    53
  o  0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    54
      () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    55
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    56
  $ hg evolve --all
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    57
  move:[4] added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    58
  atop:[5] added c
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    59
  merging d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    60
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    61
  evolve failed!
3702
f6979d64b9fb evolve: point to '--abort' in error message
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3636
diff changeset
    62
  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
3489
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    63
  abort: unresolved merge conflicts (see hg help resolve)
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    64
  [255]
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    65
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    66
  $ echo foo > d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    67
  $ hg resolve -m
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    68
  (no more unresolved files)
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    69
  continue: hg evolve --continue
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    70
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    71
  $ hg evolve --continue
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    72
  evolving 4:c41c793e0ef1 "added d"
3494
14cd04ff968e evolve: show the updated working directory after `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3493
diff changeset
    73
  working directory is now at 2a4e03d422e2
3489
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    74
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    75
  $ hg glog
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    76
  @  6:2a4e03d422e2 added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    77
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    78
  o  5:cb6a2ab625bb added c
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    79
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    80
  o  2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    81
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    82
  o  1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    83
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    84
  o  0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    85
      () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    86
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    87
Case when conflicts resolution lead to empty wdir in evolve --continue
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    88
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    89
  $ echo foo > e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    90
  $ hg ci -Aqm "added e"
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    91
  $ hg prev
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    92
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    93
  [6] added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    94
  $ echo bar > e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    95
  $ hg add e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    96
  $ hg amend
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    97
  1 new orphan changesets
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    98
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    99
  $ hg glog
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   100
  @  8:00a5c774cc37 added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   101
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   102
  | *  7:ad0a59d83efe added e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   103
  | |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   104
  | x  6:2a4e03d422e2 added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   105
  |/    () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   106
  o  5:cb6a2ab625bb added c
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   107
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   108
  o  2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   109
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   110
  o  1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   111
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   112
  o  0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   113
      () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   114
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   115
  $ hg evolve
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   116
  move:[7] added e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   117
  atop:[8] added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   118
  merging e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   119
  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   120
  evolve failed!
3702
f6979d64b9fb evolve: point to '--abort' in error message
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3636
diff changeset
   121
  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
3489
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   122
  abort: unresolved merge conflicts (see hg help resolve)
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   123
  [255]
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   124
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   125
  $ echo bar > e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   126
  $ hg resolve -m
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   127
  (no more unresolved files)
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   128
  continue: hg evolve --continue
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   129
  $ hg diff
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   130
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   131
  $ hg evolve --continue
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   132
  evolving 7:ad0a59d83efe "added e"
3636
92a2d3217de9 evolve: show a message when evolution leads to no changes to commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3503
diff changeset
   133
  evolution of 7:ad0a59d83efe created no changes to commit
3489
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   134
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   135
  $ hg glog
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   136
  @  8:00a5c774cc37 added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   137
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   138
  o  5:cb6a2ab625bb added c
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   139
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   140
  o  2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   141
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   142
  o  1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   143
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   144
  o  0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   145
      () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   146
3491
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   147
Case when there are a lot of revision to continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   148
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   149
  $ hg up c7586e2a9264
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   150
  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   151
  $ echo bar > b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   152
  $ hg add b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   153
  $ hg amend
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   154
  3 new orphan changesets
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   155
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   156
  $ hg evolve --all
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   157
  move:[2] added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   158
  atop:[9] added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   159
  merging b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   160
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   161
  evolve failed!
3702
f6979d64b9fb evolve: point to '--abort' in error message
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3636
diff changeset
   162
  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
3491
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   163
  abort: unresolved merge conflicts (see hg help resolve)
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   164
  [255]
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   165
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   166
  $ echo foo > b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   167
  $ hg resolve -m
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   168
  (no more unresolved files)
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   169
  continue: hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   170
  $ hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   171
  evolving 2:b1661037fa25 "added b"
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   172
  move:[5] added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   173
  atop:[10] added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   174
  move:[8] added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   175
  atop:[11] added c
3494
14cd04ff968e evolve: show the updated working directory after `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3493
diff changeset
   176
  working directory is now at 6642d2c9176e
3491
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   177
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   178
  $ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   179
  @  12:6642d2c9176e added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   180
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   181
  o  11:95665a2de664 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   182
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   183
  o  10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   184
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   185
  o  9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   186
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   187
  o  0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   188
      () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   189
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   190
Conlicts -> resolve -> continue -> conflicts -> resolve -> continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   191
Test multiple conflicts in one evolve
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   192
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   193
  $ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done;
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   194
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   195
  $ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   196
  @  15:09becba8f97d added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   197
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   198
  o  14:5aa7b2bbd944 added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   199
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   200
  o  13:be88f889b6dc added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   201
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   202
  o  12:6642d2c9176e added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   203
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   204
  o  11:95665a2de664 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   205
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   206
  o  10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   207
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   208
  o  9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   209
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   210
  o  0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   211
      () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   212
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   213
  $ hg up 95665a2de664
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   214
  1 files updated, 0 files merged, 4 files removed, 0 files unresolved
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   215
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   216
  $ echo bar > f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   217
  $ echo bar > h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   218
  $ hg add f h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   219
  $ hg amend
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   220
  4 new orphan changesets
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   221
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   222
  $ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   223
  @  16:645135c5caa4 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   224
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   225
  | *  15:09becba8f97d added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   226
  | |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   227
  | *  14:5aa7b2bbd944 added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   228
  | |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   229
  | *  13:be88f889b6dc added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   230
  | |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   231
  | *  12:6642d2c9176e added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   232
  | |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   233
  | x  11:95665a2de664 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   234
  |/    () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   235
  o  10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   236
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   237
  o  9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   238
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   239
  o  0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   240
      () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   241
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   242
  $ hg evolve --all
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   243
  move:[12] added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   244
  atop:[16] added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   245
  move:[13] added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   246
  atop:[17] added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   247
  merging f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   248
  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   249
  evolve failed!
3702
f6979d64b9fb evolve: point to '--abort' in error message
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3636
diff changeset
   250
  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
3491
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   251
  abort: unresolved merge conflicts (see hg help resolve)
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   252
  [255]
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   253
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   254
  $ echo foo > f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   255
  $ hg resolve -m
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   256
  (no more unresolved files)
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   257
  continue: hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   258
  $ hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   259
  evolving 13:be88f889b6dc "added f"
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   260
  move:[14] added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   261
  atop:[18] added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   262
  move:[15] added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   263
  atop:[19] added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   264
  merging h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   265
  warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   266
  evolve failed!
3702
f6979d64b9fb evolve: point to '--abort' in error message
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3636
diff changeset
   267
  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
3491
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   268
  abort: unresolved merge conflicts (see hg help resolve)
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   269
  [255]
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   270
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   271
  $ echo foo > h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   272
  $ hg resolve -m
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   273
  (no more unresolved files)
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   274
  continue: hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   275
  $ hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   276
  evolving 15:09becba8f97d "added h"
3494
14cd04ff968e evolve: show the updated working directory after `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3493
diff changeset
   277
  working directory is now at 3ba9d3d1b089
3491
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   278
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   279
Make sure, confirmopt is respected while continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   280
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   281
  $ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   282
  @  20:3ba9d3d1b089 added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   283
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   284
  o  19:981e615b14ca added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   285
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   286
  o  18:5794f1a3cbb2 added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   287
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   288
  o  17:e47537da02b3 added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   289
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   290
  o  16:645135c5caa4 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   291
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   292
  o  10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   293
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   294
  o  9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   295
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   296
  o  0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   297
      () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   298
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   299
  $ hg up 5794f1a3cbb2
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   300
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   301
  $ echo bar > g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   302
  $ hg add g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   303
  $ hg amend
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   304
  2 new orphan changesets
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   305
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   306
  $ hg evolve --all --confirm<<EOF
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   307
  > y
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   308
  > EOF
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   309
  move:[19] added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   310
  atop:[21] added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   311
  perform evolve? [Ny] y
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   312
  merging g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   313
  warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   314
  evolve failed!
3702
f6979d64b9fb evolve: point to '--abort' in error message
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3636
diff changeset
   315
  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
3491
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   316
  abort: unresolved merge conflicts (see hg help resolve)
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   317
  [255]
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   318
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   319
  $ echo foo > g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   320
  $ hg resolve -m
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   321
  (no more unresolved files)
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   322
  continue: hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   323
3492
53cd61f7f9c9 evolve: make `--continue` continue evolving all remaining revisions
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3491
diff changeset
   324
XXX: this should have asked for confirmation
3491
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   325
3493
4544067b831b evolve: make `hg evolve --continue` respect `--confirm`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3492
diff changeset
   326
  $ hg evolve --continue<<EOF
4544067b831b evolve: make `hg evolve --continue` respect `--confirm`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3492
diff changeset
   327
  > y
4544067b831b evolve: make `hg evolve --continue` respect `--confirm`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3492
diff changeset
   328
  > EOF
3491
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   329
  evolving 19:981e615b14ca "added g"
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   330
  move:[20] added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   331
  atop:[22] added g
3493
4544067b831b evolve: make `hg evolve --continue` respect `--confirm`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3492
diff changeset
   332
  perform evolve? [Ny] y
3494
14cd04ff968e evolve: show the updated working directory after `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3493
diff changeset
   333
  working directory is now at af6bd002a48d
3491
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   334
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   335
  $ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   336
  @  23:af6bd002a48d added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   337
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   338
  o  22:d2c94a8f44bd added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   339
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   340
  o  21:9849fa96c885 added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   341
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   342
  o  17:e47537da02b3 added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   343
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   344
  o  16:645135c5caa4 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   345
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   346
  o  10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   347
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   348
  o  9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   349
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   350
  o  0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   351
      () draft
3502
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   352
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   353
Testing `evolve --continue` after `hg next --evolve`
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   354
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   355
  $ hg up .^^
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   356
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   357
  $ echo foobar > g
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   358
  $ hg amend
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   359
  2 new orphan changesets
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   360
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   361
  $ hg next --evolve
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   362
  move:[22] added g
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   363
  atop:[24] added f
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   364
  merging g
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   365
  warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   366
  evolve failed!
3702
f6979d64b9fb evolve: point to '--abort' in error message
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3636
diff changeset
   367
  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
3502
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   368
  abort: unresolved merge conflicts (see hg help resolve)
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   369
  [255]
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   370
  $ echo foo > g
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   371
  $ hg resolve -m
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   372
  (no more unresolved files)
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   373
  continue: hg evolve --continue
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   374
  $ hg evolve --continue
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3494
diff changeset
   375
  evolving 22:d2c94a8f44bd "added g"