Mercurial > evolve
annotate tests/test-evolve-abort-phasediv.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 02 Aug 2018 02:47:44 +0200 |
parents | 629558d09898 |
children | 537fd9a86c06 684cc3418ecd |
rev | line source |
---|---|
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 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 $ hg init abortrepo |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 $ cd abortrepo |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 $ echo ".*\.orig" > .hgignore |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 $ hg add .hgignore |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 $ 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
|
27 $ 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
|
28 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 $ hg glog |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
30 @ 4:c41c793e0ef1 added d |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 | () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 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
|
33 | () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 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
|
35 | () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 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
|
37 | () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
38 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
|
39 () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 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
|
42 ---------------------------------------------------------------------- |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 $ hg up .^^^ |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 0 files updated, 0 files merged, 3 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
|
46 $ hg grab -r .~-3 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 grabbing 4:c41c793e0ef1 "added d" |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 $ echo foobar > c |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 $ hg add c |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 $ hg amend |
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 glog --hidden |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 @ 6:ddba58020bc0 added d |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
54 | () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
55 | 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
|
56 |/ () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
57 | 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
|
58 | | () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 | 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
|
60 | | () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 | 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
|
62 |/ () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 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
|
64 | () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
65 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
|
66 () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 $ 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
|
69 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
|
70 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 $ hg glog |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 @ 6:ddba58020bc0 added d |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 | () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 | 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
|
75 | | () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 | 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
|
77 | | () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 | 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
|
79 |/ () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 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
|
81 | () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 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
|
83 () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 $ hg evolve --phase-divergent |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 recreate:[6] added d |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 atop:[4] added d |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 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
|
88 merging c |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
89 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
90 fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
91 [1] |
3752
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
92 |
3839
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
93 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
|
94 $ hg status -v |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
95 M c |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
96 A d |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
97 # 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
|
98 |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
99 # Unresolved merge conflicts: |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
100 # |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
101 # c |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
102 # |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
103 # 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
|
104 |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
105 # To continue: hg evolve --continue |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
106 # To abort: hg evolve --abort |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
107 # To stop: hg evolve --stop |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
108 # (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
|
109 |
ac0717f23921
evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3772
diff
changeset
|
110 |
3752
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 $ hg evolve --abort |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
112 evolve aborted |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 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
|
114 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
115 $ hg glog |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
116 @ 6:ddba58020bc0 added d |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
117 | () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
118 | 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
|
119 | | () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
120 | 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
|
121 | | () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
122 | 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
|
123 |/ () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
124 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
|
125 | () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
126 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
|
127 () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
128 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
129 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
|
130 in conflicts |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
131 --------------------------------------------------------------------------------- |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
132 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
133 $ echo foo > c |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
134 $ hg amend |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
135 $ 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
|
136 $ hg prev |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
137 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
|
138 [1] added a |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
139 $ hg grab -r ca1b80f |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
140 grabbing 3:ca1b80f7960a "added c" |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
141 $ echo foobar > b |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
142 $ hg add b |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
143 $ hg amend |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
144 $ 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
|
145 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
|
146 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
147 $ hg evolve --list |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
148 e44ebefe4f54: added d |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
149 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
|
150 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
151 28cd06b3f801: added c |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
152 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
|
153 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
154 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
155 $ 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
|
156 recreate:[7] added d |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
157 atop:[4] added d |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
158 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
|
159 hg update c41c793e0ef1; |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
160 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
|
161 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
|
162 recreate:[9] added c |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
163 atop:[3] added c |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
164 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
|
165 hg update ca1b80f7960a; |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
166 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
|
167 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
|
168 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
169 $ hg glog --hidden |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
170 @ 9:28cd06b3f801 added c |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
171 | () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
172 | 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
|
173 |/ () draft |
3930
d00f0c369bc7
test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3852
diff
changeset
|
174 | o 7:e44ebefe4f54 added d |
3752
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
175 |/ () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
176 | 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
|
177 |/ () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
178 | 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
|
179 |/ () draft |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
180 | 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
|
181 | | () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
182 | 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
|
183 | | () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
184 | 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
|
185 |/ () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
186 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
|
187 | () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
188 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
|
189 () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
190 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
191 $ 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
|
192 recreate:[7] added d |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
193 atop:[4] added d |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
194 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
|
195 computing new diff |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
196 committed as c41c793e0ef1 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
197 recreate:[9] added c |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
198 atop:[3] added c |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
199 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
|
200 merging b |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
201 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
202 fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
203 [1] |
3752
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
204 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
205 $ hg evolve --abort |
3755
a19703c6d2bb
evolve: check for None before adding in set of revisions to strip
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3752
diff
changeset
|
206 evolve aborted |
a19703c6d2bb
evolve: check for None before adding in set of revisions to strip
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3752
diff
changeset
|
207 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
|
208 |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
209 $ hg glog --hidden |
3757
2bc60fcac354
evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3755
diff
changeset
|
210 @ 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
|
211 | () draft |
3757
2bc60fcac354
evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3755
diff
changeset
|
212 | 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
|
213 |/ () draft |
3930
d00f0c369bc7
test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3852
diff
changeset
|
214 | o 7:e44ebefe4f54 added d |
3757
2bc60fcac354
evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3755
diff
changeset
|
215 |/ () draft |
2bc60fcac354
evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3755
diff
changeset
|
216 | 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
|
217 |/ () draft |
2bc60fcac354
evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3755
diff
changeset
|
218 | 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
|
219 |/ () draft |
2bc60fcac354
evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3755
diff
changeset
|
220 | 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
|
221 | | () public |
3757
2bc60fcac354
evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3755
diff
changeset
|
222 | 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
|
223 | | () public |
2bc60fcac354
evolve: make `--abort` strip the temporary revs created during resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3755
diff
changeset
|
224 | 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
|
225 |/ () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
226 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
|
227 | () public |
6878d708500a
tests: add a test file `--abort` flag while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
228 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
|
229 () public |
3771
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
230 |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
231 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
|
232 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
|
233 ---------------------------------------------------------------------------- |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
234 |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
235 $ hg up e44ebefe4f54 |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
236 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
|
237 $ echo foobar > c |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
238 $ hg amend |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
239 |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
240 $ hg glog --hidden |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
241 @ 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
|
242 | () draft |
3930
d00f0c369bc7
test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3852
diff
changeset
|
243 | o 9:28cd06b3f801 added c |
3771
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
244 |/ () draft |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
245 | 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
|
246 |/ () draft |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
247 | 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
|
248 |/ () draft |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
249 | 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
|
250 |/ () draft |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
251 | 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
|
252 |/ () draft |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
253 | 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
|
254 | | () public |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
255 | 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
|
256 | | () public |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
257 | 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
|
258 |/ () public |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
259 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
|
260 | () public |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
261 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
|
262 () public |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
263 |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
264 $ 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
|
265 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
|
266 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
|
267 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
|
268 merging b |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
269 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
270 fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
271 [1] |
3771
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
272 |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
273 $ echo watwat > c |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
274 $ hg resolve -m |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
275 (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
|
276 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
|
277 $ hg evolve --continue |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
278 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
|
279 computing new diff |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
280 committed as 95d746965290 |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
281 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
|
282 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
|
283 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
|
284 merging c |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
285 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
286 fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3843
diff
changeset
|
287 [1] |
3771
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 --abort |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
290 evolve aborted |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
291 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
|
292 |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
293 $ hg glog --hidden |
3772
6240579fd0c0
evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3771
diff
changeset
|
294 @ 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
|
295 | () draft |
3930
d00f0c369bc7
test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3852
diff
changeset
|
296 | o 9:28cd06b3f801 added c |
3772
6240579fd0c0
evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3771
diff
changeset
|
297 |/ () draft |
6240579fd0c0
evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3771
diff
changeset
|
298 | 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
|
299 |/ () draft |
6240579fd0c0
evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3771
diff
changeset
|
300 | 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
|
301 |/ () draft |
6240579fd0c0
evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3771
diff
changeset
|
302 | 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
|
303 |/ () draft |
6240579fd0c0
evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3771
diff
changeset
|
304 | 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
|
305 |/ () draft |
6240579fd0c0
evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3771
diff
changeset
|
306 | 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
|
307 | | () public |
3772
6240579fd0c0
evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3771
diff
changeset
|
308 | 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
|
309 | | () public |
6240579fd0c0
evolve: fix storage of replacements and temprevs node in evolvestate
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3771
diff
changeset
|
310 | 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
|
311 |/ () public |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
312 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
|
313 | () public |
1f339d81aabd
tests: add more tests related to aborting while resolving phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3757
diff
changeset
|
314 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
|
315 () public |