tests/test-evolve-continue.t
author Pulkit Goyal <7895pulkit@gmail.com>
Sun, 04 Feb 2018 20:58:03 +0530
changeset 3491 92df1aac8c7f
parent 3490 51c0a23b519e
child 3492 53cd61f7f9c9
permissions -rw-r--r--
tests: add more tests to test-evolve-continue.t This patch adds more tests for `hg evolve --continue`. The tests demonstrates how the continuation handling of hg evolve is broken and the later patches fixes that handling.
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!
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    62
  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
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"
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    73
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    74
  $ hg glog
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    75
  @  6:2a4e03d422e2 added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    76
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    77
  o  5:cb6a2ab625bb added c
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    78
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    79
  o  2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    80
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    81
  o  1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    82
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    83
  o  0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    84
      () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    85
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    86
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
    87
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    88
  $ echo foo > e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    89
  $ hg ci -Aqm "added e"
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    90
  $ hg prev
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    91
  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
    92
  [6] added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    93
  $ echo bar > e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    94
  $ hg add e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    95
  $ hg amend
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    96
  1 new orphan changesets
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    97
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    98
  $ hg glog
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    99
  @  8:00a5c774cc37 added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   100
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   101
  | *  7:ad0a59d83efe added e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   102
  | |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   103
  | x  6:2a4e03d422e2 added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   104
  |/    () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   105
  o  5:cb6a2ab625bb added c
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   106
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   107
  o  2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   108
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   109
  o  1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   110
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   111
  o  0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   112
      () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   113
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   114
  $ hg evolve
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   115
  move:[7] added e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   116
  atop:[8] added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   117
  merging e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   118
  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
   119
  evolve failed!
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   120
  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   121
  abort: unresolved merge conflicts (see hg help resolve)
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   122
  [255]
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   123
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   124
  $ echo bar > e
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   125
  $ hg resolve -m
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   126
  (no more unresolved files)
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   127
  continue: hg evolve --continue
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   128
  $ hg diff
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   129
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   130
XXX: maybe we should add a message here about evolve resulting in no commit
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"
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   133
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   134
  $ hg glog
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   135
  @  8:00a5c774cc37 added d
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   136
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   137
  o  5:cb6a2ab625bb added c
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   138
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   139
  o  2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   140
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   141
  o  1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   142
  |   () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   143
  o  0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   144
      () draft
ee72cdc2387b tests: add tests for `hg evolve --continue`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   145
3491
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   146
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
   147
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   148
  $ hg up c7586e2a9264
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   149
  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
   150
  $ echo bar > b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   151
  $ hg add b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   152
  $ hg amend
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   153
  3 new orphan changesets
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   154
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   155
  $ hg evolve --all
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   156
  move:[2] added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   157
  atop:[9] added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   158
  merging b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   159
  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
   160
  evolve failed!
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   161
  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   162
  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
   163
  [255]
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   164
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   165
  $ echo foo > b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   166
  $ hg resolve -m
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   167
  (no more unresolved files)
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   168
  continue: hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   169
  $ hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   170
  evolving 2:b1661037fa25 "added b"
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   171
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   172
  $ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   173
  @  10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   174
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   175
  o  9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   176
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   177
  | *  8:00a5c774cc37 added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   178
  | |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   179
  | *  5:cb6a2ab625bb added c
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
  | x  2:b1661037fa25 added b
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
  | x  1:c7586e2a9264 added a
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  0:8fa14d15e168 added hgignore
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
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   188
XXX: we should not have required an extra call to `hg evolve` here
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
  $ hg evolve --all
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   191
  move:[5] added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   192
  atop:[10] added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   193
  move:[8] added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   194
  atop:[11] added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   195
  working directory is now at 6642d2c9176e
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   196
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   197
  $ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   198
  @  12:6642d2c9176e added d
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  11:95665a2de664 added c
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  10:87f748868183 added b
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  9:53b632d203d8 added a
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  0:8fa14d15e168 added hgignore
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
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   209
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
   210
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
   211
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   212
  $ 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
   213
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   214
  $ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   215
  @  15:09becba8f97d added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   216
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   217
  o  14:5aa7b2bbd944 added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   218
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   219
  o  13:be88f889b6dc added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   220
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   221
  o  12:6642d2c9176e added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   222
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   223
  o  11:95665a2de664 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
  o  10:87f748868183 added b
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
  o  9:53b632d203d8 added a
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
  o  0:8fa14d15e168 added hgignore
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
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   232
  $ hg up 95665a2de664
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   233
  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
   234
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   235
  $ echo bar > f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   236
  $ echo bar > h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   237
  $ hg add f h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   238
  $ hg amend
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   239
  4 new orphan changesets
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   240
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   241
  $ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   242
  @  16:645135c5caa4 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   243
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   244
  | *  15:09becba8f97d added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   245
  | |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   246
  | *  14:5aa7b2bbd944 added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   247
  | |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   248
  | *  13:be88f889b6dc added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   249
  | |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   250
  | *  12:6642d2c9176e added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   251
  | |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   252
  | x  11:95665a2de664 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   253
  |/    () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   254
  o  10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   255
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   256
  o  9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   257
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   258
  o  0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   259
      () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   260
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   261
  $ hg evolve --all
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   262
  move:[12] added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   263
  atop:[16] added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   264
  move:[13] added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   265
  atop:[17] added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   266
  merging f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   267
  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
   268
  evolve failed!
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   269
  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   270
  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
   271
  [255]
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   272
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   273
  $ echo foo > f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   274
  $ hg resolve -m
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   275
  (no more unresolved files)
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   276
  continue: hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   277
  $ hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   278
  evolving 13:be88f889b6dc "added f"
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   279
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   280
XXX: we should not require this extra `hg evolve --all` call
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   281
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   282
  $ hg evolve --all
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   283
  move:[14] added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   284
  atop:[18] added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   285
  move:[15] added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   286
  atop:[19] added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   287
  merging h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   288
  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
   289
  evolve failed!
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   290
  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   291
  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
   292
  [255]
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   293
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   294
  $ echo foo > h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   295
  $ hg resolve -m
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   296
  (no more unresolved files)
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   297
  continue: hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   298
  $ hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   299
  evolving 15:09becba8f97d "added h"
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   300
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   301
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
   302
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   303
  $ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   304
  @  20:3ba9d3d1b089 added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   305
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   306
  o  19:981e615b14ca added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   307
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   308
  o  18:5794f1a3cbb2 added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   309
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   310
  o  17:e47537da02b3 added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   311
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   312
  o  16:645135c5caa4 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   313
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   314
  o  10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   315
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   316
  o  9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   317
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   318
  o  0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   319
      () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   320
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   321
  $ hg up 5794f1a3cbb2
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   322
  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
   323
  $ echo bar > g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   324
  $ hg add g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   325
  $ hg amend
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   326
  2 new orphan changesets
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   327
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   328
  $ hg evolve --all --confirm<<EOF
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   329
  > y
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   330
  > EOF
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   331
  move:[19] added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   332
  atop:[21] added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   333
  perform evolve? [Ny] y
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   334
  merging g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   335
  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
   336
  evolve failed!
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   337
  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   338
  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
   339
  [255]
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   340
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   341
  $ echo foo > g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   342
  $ hg resolve -m
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   343
  (no more unresolved files)
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   344
  continue: hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   345
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   346
XXX: so this evolve should continue the rest of evolve and ask for confirmation
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   347
before evolving. evolve --continue is broken right now and should be fixed.
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   348
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   349
  $ hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   350
  evolving 19:981e615b14ca "added g"
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   351
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   352
XXX: we should not need this extra call to evolve
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   353
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   354
  $ hg evolve --all
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   355
  move:[20] added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   356
  atop:[22] added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   357
  working directory is now at af6bd002a48d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   358
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   359
  $ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   360
  @  23:af6bd002a48d added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   361
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   362
  o  22:d2c94a8f44bd added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   363
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   364
  o  21:9849fa96c885 added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   365
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   366
  o  17:e47537da02b3 added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   367
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   368
  o  16:645135c5caa4 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   369
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   370
  o  10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   371
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   372
  o  9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   373
  |   () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   374
  o  0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3490
diff changeset
   375
      () draft