tests/test-evolve-abort-phasediv.t
author Kyle Lippincott <spectral@google.com>
Mon, 16 Sep 2019 12:44:38 -0700
changeset 4848 535ab2609e45
parent 4798 2e14a9386316
child 4863 5cd7d16b8733
permissions -rw-r--r--
cmdstate: introduce a "saver" contextmanager and use it in place of save() Previously, the state was only saved in some paths out of these functions. This can be problematic, if the user ctrl-c's (or `kill -9`'s) the process, or we exit out of `relocate` for anything besides the "expected" reason, we won't record that we were in the middle of an evolve. One of our users has discovered that this leaves hg in a weird state; the user did something like this: ``` $ hg evolve <something goes wrong with the merge tool, hits ctrl-c> <deals with the merge conflicts> $ hg evolve --continue abort: no interrupted evolve to continue $ hg evolve abort: uncommitted changes # Note: commands.status.verbose=True is set. $ hg status M foo # The repository is in an unfinished *update* state. # No unresolved merge conflicts # To continue: hg update ``` The user did an `hg update`, but it didn't actually do anything besides take it out of the unfinished update state (the files were still dirty in the working directory).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     1
Tests for the --abort flag for `hg evolve` command while phase-divergence resolution
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     2
====================================================================================
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     3
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     4
The `--abort` flag aborts the interuppted evolve by undoing all the work which
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     5
was done during resolution i.e. stripping new changesets created, moving
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     6
bookmarks back, moving working directory back.
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     7
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     8
This test contains cases when `hg evolve` is doing phase-divergence resolution.
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     9
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    10
Setup
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    11
=====
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    12
4798
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    13
#testcases abortcommand abortflag
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    14
  $ cat >> $HGRCPATH <<EOF
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    15
  > [phases]
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    16
  > publish = False
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    17
  > [alias]
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    18
  > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    19
  > [extensions]
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    20
  > EOF
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    21
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    22
4798
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    23
#if abortflag
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    24
  $ cat >> $HGRCPATH <<EOF
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    25
  > [alias]
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    26
  > abort = evolve --abort
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    27
  > EOF
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    28
#endif
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    29
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    30
  $ hg init abortrepo
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    31
  $ cd abortrepo
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    32
  $ echo ".*\.orig" > .hgignore
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    33
  $ hg add .hgignore
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    34
  $ hg ci -m "added hgignore"
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    35
  $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    36
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    37
  $ hg glog
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    38
  @  4:c41c793e0ef1 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    39
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    40
  o  3:ca1b80f7960a added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    41
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    42
  o  2:b1661037fa25 added b
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    43
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    44
  o  1:c7586e2a9264 added a
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    45
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    46
  o  0:8fa14d15e168 added hgignore
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    47
      () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    48
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    49
Creating phase divergence, resolution of which will lead to conflicts
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    50
----------------------------------------------------------------------
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    51
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    52
  $ hg up .^^^
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    53
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
4053
ecbf61d90807 pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4049
diff changeset
    54
  $ hg pick -r .~-3
4049
25981fae92f9 pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3978
diff changeset
    55
  picking 4:c41c793e0ef1 "added d"
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    56
  $ echo foobar > c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    57
  $ hg add c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    58
  $ hg amend
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    59
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    60
  $ hg glog --hidden
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    61
  @  6:ddba58020bc0 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    62
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    63
  | x  5:cfe30edc6125 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    64
  |/    () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    65
  | x  4:c41c793e0ef1 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    66
  | |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    67
  | o  3:ca1b80f7960a added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    68
  | |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    69
  | o  2:b1661037fa25 added b
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    70
  |/    () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    71
  o  1:c7586e2a9264 added a
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    72
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    73
  o  0:8fa14d15e168 added hgignore
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    74
      () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    75
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    76
  $ hg phase -r c41c793e0ef1 --public --hidden
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    77
  1 new phase-divergent changesets
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    78
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    79
  $ hg glog
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    80
  @  6:ddba58020bc0 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    81
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    82
  | o  4:c41c793e0ef1 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    83
  | |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    84
  | o  3:ca1b80f7960a added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    85
  | |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    86
  | o  2:b1661037fa25 added b
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    87
  |/    () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    88
  o  1:c7586e2a9264 added a
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    89
  |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    90
  o  0:8fa14d15e168 added hgignore
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    91
      () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    92
  $ hg evolve --phase-divergent
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    93
  recreate:[6] added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    94
  atop:[4] added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    95
  rebasing to destination parent: ca1b80f7960a
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    96
  merging c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    97
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4454
diff changeset
    98
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4454
diff changeset
    99
  (see 'hg help evolve.interrupted')
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3843
diff changeset
   100
  [1]
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   101
3839
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   102
testing that interrupted evolve shows up in morestatus
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   103
  $ hg status -v
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   104
  M c
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   105
  A d
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   106
  # The repository is in an unfinished *evolve* state.
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   107
  
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   108
  # Unresolved merge conflicts:
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   109
  # 
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   110
  #     c
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   111
  # 
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   112
  # To mark files as resolved:  hg resolve --mark FILE
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   113
  
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   114
  # To continue:    hg evolve --continue
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   115
  # To abort:       hg evolve --abort
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   116
  # To stop:        hg evolve --stop
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   117
  # (also see `hg help evolve.interrupted`)
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   118
  
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   119
3976
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   120
  $ hg parents
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   121
  changeset:   3:ca1b80f7960a
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   122
  user:        test
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   123
  date:        Thu Jan 01 00:00:00 1970 +0000
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   124
  summary:     added c
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   125
  
3978
fb8e44c70798 evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3976
diff changeset
   126
  changeset:   6:ddba58020bc0
fb8e44c70798 evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3976
diff changeset
   127
  tag:         tip
fb8e44c70798 evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3976
diff changeset
   128
  parent:      1:c7586e2a9264
fb8e44c70798 evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3976
diff changeset
   129
  user:        test
fb8e44c70798 evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3976
diff changeset
   130
  date:        Thu Jan 01 00:00:00 1970 +0000
fb8e44c70798 evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3976
diff changeset
   131
  instability: phase-divergent
fb8e44c70798 evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3976
diff changeset
   132
  summary:     added d
fb8e44c70798 evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3976
diff changeset
   133
  
3976
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   134
4798
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
   135
  $ hg abort
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   136
  evolve aborted
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   137
  working directory is now at ddba58020bc0
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   138
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   139
  $ hg glog
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   140
  @  6:ddba58020bc0 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   141
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   142
  | o  4:c41c793e0ef1 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   143
  | |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   144
  | o  3:ca1b80f7960a added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   145
  | |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   146
  | o  2:b1661037fa25 added b
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   147
  |/    () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   148
  o  1:c7586e2a9264 added a
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   149
  |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   150
  o  0:8fa14d15e168 added hgignore
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   151
      () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   152
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   153
When there are multiple phase-divergent changes, resolution of last one resulted
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   154
in conflicts
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   155
---------------------------------------------------------------------------------
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   156
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   157
  $ echo foo > c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   158
  $ hg amend
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   159
  $ hg phase -r ca1b80f --draft --force
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   160
  $ hg prev
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   161
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   162
  [1] added a
4053
ecbf61d90807 pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4049
diff changeset
   163
  $ hg pick -r ca1b80f
4049
25981fae92f9 pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3978
diff changeset
   164
  picking 3:ca1b80f7960a "added c"
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   165
  $ echo foobar > b
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   166
  $ hg add b
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   167
  $ hg amend
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   168
  $ hg phase -r c41c793e0ef1 --public --hidden
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   169
  2 new phase-divergent changesets
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   170
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   171
  $ hg evolve --list
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   172
  e44ebefe4f54: added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   173
    phase-divergent: c41c793e0ef1 (immutable precursor)
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   174
  
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   175
  28cd06b3f801: added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   176
    phase-divergent: ca1b80f7960a (immutable precursor)
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   177
  
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   178
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   179
  $ hg evolve --dry-run --all --phase-divergent
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   180
  recreate:[7] added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   181
  atop:[4] added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   182
  hg rebase --rev e44ebefe4f54 --dest ca1b80f7960a;
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   183
  hg update c41c793e0ef1;
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   184
  hg revert --all --rev e44ebefe4f54;
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   185
  hg commit --msg "phase-divergent update to e44ebefe4f54"
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   186
  recreate:[9] added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   187
  atop:[3] added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   188
  hg rebase --rev 28cd06b3f801 --dest b1661037fa25;
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   189
  hg update ca1b80f7960a;
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   190
  hg revert --all --rev 28cd06b3f801;
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   191
  hg commit --msg "phase-divergent update to 28cd06b3f801"
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   192
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   193
  $ hg glog --hidden
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   194
  @  9:28cd06b3f801 added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   195
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   196
  | x  8:9ff8adbe8a24 added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   197
  |/    () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   198
  | *  7:e44ebefe4f54 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   199
  |/    () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   200
  | x  6:ddba58020bc0 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   201
  |/    () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   202
  | x  5:cfe30edc6125 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   203
  |/    () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   204
  | o  4:c41c793e0ef1 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   205
  | |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   206
  | o  3:ca1b80f7960a added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   207
  | |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   208
  | o  2:b1661037fa25 added b
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   209
  |/    () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   210
  o  1:c7586e2a9264 added a
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   211
  |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   212
  o  0:8fa14d15e168 added hgignore
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   213
      () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   214
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   215
  $ hg evolve --phase-divergent --all
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   216
  recreate:[7] added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   217
  atop:[4] added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   218
  rebasing to destination parent: ca1b80f7960a
4453
700b8b3a5a54 evolve: clarify output when phase-divergence resolution results in no change
Martin von Zweigbergk <martinvonz@google.com>
parents: 4053
diff changeset
   219
  no changes to commit
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   220
  recreate:[9] added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   221
  atop:[3] added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   222
  rebasing to destination parent: b1661037fa25
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   223
  merging b
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   224
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4454
diff changeset
   225
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4454
diff changeset
   226
  (see 'hg help evolve.interrupted')
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3843
diff changeset
   227
  [1]
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   228
4798
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
   229
  $ hg abort
3757
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   230
  1 new phase-divergent changesets
3755
a19703c6d2bb evolve: check for None before adding in set of revisions to strip
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3752
diff changeset
   231
  evolve aborted
a19703c6d2bb evolve: check for None before adding in set of revisions to strip
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3752
diff changeset
   232
  working directory is now at 28cd06b3f801
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   233
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   234
  $ hg glog --hidden
3757
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   235
  @  9:28cd06b3f801 added c
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   236
  |   () draft
3757
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   237
  | x  8:9ff8adbe8a24 added c
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   238
  |/    () draft
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   239
  | *  7:e44ebefe4f54 added d
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   240
  |/    () draft
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   241
  | x  6:ddba58020bc0 added d
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   242
  |/    () draft
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   243
  | x  5:cfe30edc6125 added d
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   244
  |/    () draft
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   245
  | o  4:c41c793e0ef1 added d
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   246
  | |   () public
3757
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   247
  | o  3:ca1b80f7960a added c
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   248
  | |   () public
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   249
  | o  2:b1661037fa25 added b
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   250
  |/    () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   251
  o  1:c7586e2a9264 added a
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   252
  |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   253
  o  0:8fa14d15e168 added hgignore
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   254
      () public
3771
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   255
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   256
When there are multiple conflicted phase-divergence resolution and we abort
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   257
after resolving one of them
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   258
----------------------------------------------------------------------------
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   259
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   260
  $ hg up e44ebefe4f54
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   261
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   262
  $ echo foobar > c
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   263
  $ hg amend
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   264
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   265
  $ hg glog --hidden
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   266
  @  10:ef9b72b9b42c added d
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   267
  |   () draft
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   268
  | *  9:28cd06b3f801 added c
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   269
  |/    () draft
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   270
  | x  8:9ff8adbe8a24 added c
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   271
  |/    () draft
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   272
  | x  7:e44ebefe4f54 added d
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   273
  |/    () draft
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   274
  | x  6:ddba58020bc0 added d
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   275
  |/    () draft
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   276
  | x  5:cfe30edc6125 added d
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   277
  |/    () draft
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   278
  | o  4:c41c793e0ef1 added d
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   279
  | |   () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   280
  | o  3:ca1b80f7960a added c
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   281
  | |   () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   282
  | o  2:b1661037fa25 added b
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   283
  |/    () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   284
  o  1:c7586e2a9264 added a
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   285
  |   () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   286
  o  0:8fa14d15e168 added hgignore
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   287
      () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   288
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   289
  $ hg evolve --phase-divergent --all
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   290
  recreate:[9] added c
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   291
  atop:[3] added c
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   292
  rebasing to destination parent: b1661037fa25
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   293
  merging b
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   294
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4454
diff changeset
   295
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4454
diff changeset
   296
  (see 'hg help evolve.interrupted')
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3843
diff changeset
   297
  [1]
3771
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   298
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   299
  $ echo watwat > c
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   300
  $ hg resolve -m
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   301
  (no more unresolved files)
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   302
  continue: hg evolve --continue
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   303
  $ hg evolve --continue
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   304
  evolving 9:28cd06b3f801 "added c"
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   305
  committed as 95d746965290
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   306
  recreate:[10] added d
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   307
  atop:[4] added d
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   308
  rebasing to destination parent: ca1b80f7960a
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   309
  merging c
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   310
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4454
diff changeset
   311
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4454
diff changeset
   312
  (see 'hg help evolve.interrupted')
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3843
diff changeset
   313
  [1]
3771
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   314
4798
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
   315
  $ hg abort
3772
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   316
  1 new phase-divergent changesets
3771
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   317
  evolve aborted
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   318
  working directory is now at ef9b72b9b42c
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   319
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   320
  $ hg glog --hidden
3772
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   321
  @  10:ef9b72b9b42c added d
3771
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   322
  |   () draft
3772
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   323
  | *  9:28cd06b3f801 added c
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   324
  |/    () draft
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   325
  | x  8:9ff8adbe8a24 added c
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   326
  |/    () draft
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   327
  | x  7:e44ebefe4f54 added d
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   328
  |/    () draft
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   329
  | x  6:ddba58020bc0 added d
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   330
  |/    () draft
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   331
  | x  5:cfe30edc6125 added d
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   332
  |/    () draft
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   333
  | o  4:c41c793e0ef1 added d
3771
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   334
  | |   () public
3772
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   335
  | o  3:ca1b80f7960a added c
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   336
  | |   () public
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   337
  | o  2:b1661037fa25 added b
3771
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   338
  |/    () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   339
  o  1:c7586e2a9264 added a
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   340
  |   () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   341
  o  0:8fa14d15e168 added hgignore
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   342
      () public