tests/test-evolve-abort-phasediv.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Sat, 05 Oct 2019 13:50:07 -0400
branchmercurial-4.8
changeset 4885 1bbc4c7873c2
parent 4863 5cd7d16b8733
permissions -rw-r--r--
test-compat: merge mercurial-4.9 into mercurial-4.8
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
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    13
  $ cat >> $HGRCPATH <<EOF
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    14
  > [phases]
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    15
  > publish = False
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    16
  > [alias]
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    17
  > 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
    18
  > [extensions]
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    19
  > EOF
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    20
  $ 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
    21
4798
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    22
  $ cat >> $HGRCPATH <<EOF
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    23
  > [alias]
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    24
  > abort = evolve --abort
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    25
  > EOF
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
    26
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    27
  $ hg init abortrepo
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    28
  $ cd abortrepo
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    29
  $ echo ".*\.orig" > .hgignore
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    30
  $ hg add .hgignore
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    31
  $ 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
    32
  $ 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
    33
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    34
  $ hg glog
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    35
  @  4:c41c793e0ef1 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    36
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    37
  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
    38
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    39
  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
    40
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    41
  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
    42
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    43
  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
    44
      () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    45
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    46
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
    47
----------------------------------------------------------------------
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
  $ hg up .^^^
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    50
  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
    51
  $ 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
    52
  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
    53
  $ echo foobar > c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    54
  $ hg add c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    55
  $ hg amend
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    56
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    57
  $ hg glog --hidden
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    58
  @  6:ddba58020bc0 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    59
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    60
  | 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
    61
  |/    () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    62
  | 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
    63
  | |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    64
  | 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
    65
  | |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    66
  | 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
    67
  |/    () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    68
  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
    69
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    70
  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
    71
      () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    72
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    73
  $ 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
    74
  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
    75
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    76
  $ hg glog
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    77
  @  6:ddba58020bc0 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    78
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    79
  | 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
    80
  | |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    81
  | 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
    82
  | |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    83
  | 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
    84
  |/    () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    85
  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
    86
  |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    87
  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
    88
      () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    89
  $ hg evolve --phase-divergent
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    90
  recreate:[6] added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    91
  atop:[4] added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    92
  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
    93
  merging c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    94
  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
    95
  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
    96
  (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
    97
  [1]
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    98
3839
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
    99
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
   100
  $ hg status -v
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   101
  M c
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   102
  A d
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   103
  # 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
   104
  
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   105
  # Unresolved merge conflicts:
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   106
  # 
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   107
  #     c
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   108
  # 
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   109
  # 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
   110
  
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   111
  # To continue:    hg evolve --continue
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   112
  # To abort:       hg evolve --abort
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   113
  # To stop:        hg evolve --stop
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   114
  # (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
   115
  
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3772
diff changeset
   116
3976
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   117
  $ hg parents
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   118
  changeset:   3:ca1b80f7960a
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   119
  user:        test
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   120
  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
   121
  summary:     added c
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   122
  
3978
fb8e44c70798 evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3976
diff changeset
   123
  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
   124
  tag:         tip
fb8e44c70798 evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3976
diff changeset
   125
  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
   126
  user:        test
fb8e44c70798 evolve: set the second parent if we get conflicts while evolving
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3976
diff changeset
   127
  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
   128
  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
   129
  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
   130
  
3976
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3852
diff changeset
   131
4798
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
   132
  $ hg abort
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   133
  evolve aborted
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   134
  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
   135
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   136
  $ hg glog
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   137
  @  6:ddba58020bc0 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   138
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   139
  | 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
   140
  | |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   141
  | 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
   142
  | |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   143
  | 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
   144
  |/    () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   145
  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
   146
  |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   147
  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
   148
      () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   149
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   150
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
   151
in conflicts
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
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   154
  $ echo foo > c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   155
  $ hg amend
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   156
  $ 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
   157
  $ hg prev
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   158
  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
   159
  [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
   160
  $ 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
   161
  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
   162
  $ echo foobar > b
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   163
  $ hg add b
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   164
  $ hg amend
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   165
  $ 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
   166
  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
   167
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   168
  $ hg evolve --list
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   169
  e44ebefe4f54: added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   170
    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
   171
  
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   172
  28cd06b3f801: added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   173
    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
   174
  
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   175
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   176
  $ 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
   177
  recreate:[7] added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   178
  atop:[4] added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   179
  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
   180
  hg update c41c793e0ef1;
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   181
  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
   182
  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
   183
  recreate:[9] added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   184
  atop:[3] added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   185
  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
   186
  hg update ca1b80f7960a;
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   187
  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
   188
  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
   189
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   190
  $ hg glog --hidden
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   191
  @  9:28cd06b3f801 added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   192
  |   () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   193
  | 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
   194
  |/    () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   195
  | *  7:e44ebefe4f54 added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   196
  |/    () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   197
  | 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
   198
  |/    () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   199
  | 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
   200
  |/    () draft
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   201
  | 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
   202
  | |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   203
  | 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
   204
  | |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   205
  | 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
   206
  |/    () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   207
  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
   208
  |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   209
  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
   210
      () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   211
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   212
  $ 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
   213
  recreate:[7] added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   214
  atop:[4] added d
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   215
  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
   216
  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
   217
  recreate:[9] added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   218
  atop:[3] added c
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   219
  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
   220
  merging b
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   221
  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
   222
  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
   223
  (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
   224
  [1]
3752
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   225
4798
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
   226
  $ hg abort
3757
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   227
  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
   228
  evolve aborted
a19703c6d2bb evolve: check for None before adding in set of revisions to strip
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3752
diff changeset
   229
  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
   230
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   231
  $ hg glog --hidden
3757
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   232
  @  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
   233
  |   () draft
3757
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   234
  | 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
   235
  |/    () draft
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   236
  | *  7:e44ebefe4f54 added d
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   237
  |/    () draft
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   238
  | 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
   239
  |/    () draft
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   240
  | 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
   241
  |/    () draft
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   242
  | 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
   243
  | |   () public
3757
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   244
  | 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
   245
  | |   () public
2bc60fcac354 evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3755
diff changeset
   246
  | 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
   247
  |/    () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   248
  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
   249
  |   () public
6878d708500a tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   250
  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
   251
      () public
3771
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   252
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   253
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
   254
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
   255
----------------------------------------------------------------------------
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   256
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   257
  $ hg up e44ebefe4f54
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   258
  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
   259
  $ echo foobar > c
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   260
  $ hg amend
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   261
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   262
  $ hg glog --hidden
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   263
  @  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
   264
  |   () draft
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   265
  | *  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
   266
  |/    () draft
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   267
  | 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
   268
  |/    () draft
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   269
  | 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
   270
  |/    () draft
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   271
  | 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
   272
  |/    () draft
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   273
  | 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
   274
  |/    () draft
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   275
  | 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
   276
  | |   () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   277
  | 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
   278
  | |   () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   279
  | 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
   280
  |/    () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   281
  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
   282
  |   () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   283
  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
   284
      () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   285
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   286
  $ 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
   287
  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
   288
  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
   289
  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
   290
  merging b
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   291
  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
   292
  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
   293
  (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
   294
  [1]
3771
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   295
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   296
  $ echo watwat > c
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   297
  $ hg resolve -m
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   298
  (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
   299
  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
   300
  $ hg evolve --continue
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   301
  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
   302
  committed as 95d746965290
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   303
  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
   304
  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
   305
  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
   306
  merging c
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   307
  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
   308
  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
   309
  (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
   310
  [1]
3771
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   311
4798
2e14a9386316 abort: added support for evolve to hg abort
Taapas Agrawal <taapas2897@gmail.com>
parents: 4676
diff changeset
   312
  $ hg abort
3772
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   313
  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
   314
  evolve aborted
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   315
  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
   316
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   317
  $ hg glog --hidden
3772
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   318
  @  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
   319
  |   () draft
3772
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   320
  | *  9:28cd06b3f801 added c
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   321
  |/    () draft
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   322
  | 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
   323
  |/    () draft
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   324
  | 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
   325
  |/    () draft
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   326
  | 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
   327
  |/    () draft
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   328
  | 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
   329
  |/    () draft
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   330
  | 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
   331
  | |   () public
3772
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   332
  | 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
   333
  | |   () public
6240579fd0c0 evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3771
diff changeset
   334
  | 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
   335
  |/    () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   336
  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
   337
  |   () public
1f339d81aabd tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3757
diff changeset
   338
  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
   339
      () public