annotate tests/test-evolve-stop-contentdiv.t @ 4024:210f8abdfcd7 stable

sqlcache: protect read query too Some error (like locked database) can even happens when doing readonly operation. So we protect them too. At that point, it seems that pysqlite3 is not the right tool for this job.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 27 Aug 2018 11:40:32 +0200
parents 796334340cad
children f7afd3a158e3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3761
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
1 Tests for the --stop flag for `hg evolve` command while resolving content-divergence
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
2 ==================================================================================
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
3
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
4 The `--stop` flag stops the interrupted evolution and delete the state file so
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
5 user can do other things and comeback and do evolution later on
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
6
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
7 This is testing cases when `hg evolve` command is doing content-divergence resolution.
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
8
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
9 Setup
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
10 =====
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
11
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
12 $ cat >> $HGRCPATH <<EOF
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
13 > [alias]
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
14 > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
15 > [extensions]
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
16 > EOF
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
17 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
18
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
19 $ hg init stoprepo
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
20 $ cd stoprepo
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
21 $ echo ".*\.orig" > .hgignore
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
22 $ hg add .hgignore
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
23 $ hg ci -m "added hgignore"
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
24 $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
25
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
26 $ hg glog
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
27 @ 4:c41c793e0ef1 added d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
28 | () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
29 o 3:ca1b80f7960a added c
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
30 | () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
31 o 2:b1661037fa25 added b
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
32 | () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
33 o 1:c7586e2a9264 added a
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
34 | () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
35 o 0:8fa14d15e168 added hgignore
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
36 () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
37
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
38 Creating content divergence, resolution of which will lead to conflicts
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
39 -----------------------------------------------------------------------
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
40
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
41 $ echo bar > d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
42 $ hg amend
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
43
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
44 $ hg up c41c793e0ef1 --hidden
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
46 updated to hidden changeset c41c793e0ef1
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
47 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
48 working directory parent is obsolete! (c41c793e0ef1)
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
49 (use 'hg evolve' to update to its successor: e49523854bc8)
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
50
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
51 $ echo foobar > d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
52 $ hg amend
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
53 2 new content-divergent changesets
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
54 $ hg glog --hidden
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
55 @ 6:9c1631e352d9 added d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
56 | () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
57 | * 5:e49523854bc8 added d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
58 |/ () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
59 | x 4:c41c793e0ef1 added d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
60 |/ () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
61 o 3:ca1b80f7960a added c
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
62 | () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
63 o 2:b1661037fa25 added b
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
64 | () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
65 o 1:c7586e2a9264 added a
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
66 | () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
67 o 0:8fa14d15e168 added hgignore
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
68 () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
69
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
70 $ hg evolve --content-divergent
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
71 merge:[6] added d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
72 with: [5] added d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
73 base: [4] added d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
74 merging "other" content-divergent changeset 'e49523854bc8'
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
75 merging d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
76 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
78 fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
79 [1]
3761
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
80
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
81 $ hg evolve --stop
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
82 stopped the interrupted evolve
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
83 working directory is now at 9c1631e352d9
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
84
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
85 $ hg glog --hidden
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
86 @ 6:9c1631e352d9 added d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
87 | () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
88 | * 5:e49523854bc8 added d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
89 |/ () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
90 | x 4:c41c793e0ef1 added d
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
91 |/ () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
92 o 3:ca1b80f7960a added c
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
93 | () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
94 o 2:b1661037fa25 added b
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
95 | () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
96 o 1:c7586e2a9264 added a
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
97 | () draft
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
98 o 0:8fa14d15e168 added hgignore
777c29ac02bf content-div: add test showing `--stop` works during interrupted resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
99 () draft
3823
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
100
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
101 Content divergence with parent change which will result in conflicts while
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
102 merging
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
103 ---------------------------------------------------------------------------
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
104
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
105 $ hg rebase -r . -d .^^^ --config extensions.rebase=
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
106 rebasing 6:9c1631e352d9 "added d" (tip)
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
107
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
108 $ hg glog
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
109 @ 7:517d4375cb72 added d
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
110 | () draft
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
111 | * 5:e49523854bc8 added d
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
112 | | () draft
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
113 | o 3:ca1b80f7960a added c
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
114 | | () draft
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
115 | o 2:b1661037fa25 added b
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
116 |/ () draft
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
117 o 1:c7586e2a9264 added a
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
118 | () draft
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
119 o 0:8fa14d15e168 added hgignore
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
120 () draft
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
121
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
122 $ hg evolve --content-divergent
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
123 merge:[5] added d
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
124 with: [7] added d
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
125 base: [4] added d
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
126 rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
127 updating to "local" side of the conflict: e49523854bc8
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
128 merging "other" content-divergent changeset '606ad96040fc'
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
129 merging d
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
130 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
131 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
132 fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
133 [1]
3823
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
134
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
135 $ hg evolve --stop
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
136 stopped the interrupted evolve
3827
82c72eb37f85 evolve: strip the relocation commit on `hg evolve --stop`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3823
diff changeset
137 working directory is now at 517d4375cb72
3823
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
138
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
139 $ hg glog
3827
82c72eb37f85 evolve: strip the relocation commit on `hg evolve --stop`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3823
diff changeset
140 @ 7:517d4375cb72 added d
3823
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
141 | () draft
3827
82c72eb37f85 evolve: strip the relocation commit on `hg evolve --stop`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3823
diff changeset
142 | * 5:e49523854bc8 added d
82c72eb37f85 evolve: strip the relocation commit on `hg evolve --stop`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3823
diff changeset
143 | | () draft
82c72eb37f85 evolve: strip the relocation commit on `hg evolve --stop`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3823
diff changeset
144 | o 3:ca1b80f7960a added c
82c72eb37f85 evolve: strip the relocation commit on `hg evolve --stop`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3823
diff changeset
145 | | () draft
82c72eb37f85 evolve: strip the relocation commit on `hg evolve --stop`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3823
diff changeset
146 | o 2:b1661037fa25 added b
3823
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
147 |/ () draft
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
148 o 1:c7586e2a9264 added a
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
149 | () draft
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
150 o 0:8fa14d15e168 added hgignore
7b33a6ed0539 tests: add test for --stop flag when resolving multiparents content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3761
diff changeset
151 () draft
3828
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
152
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
153 Content-divergence with parent-change which will result in conflicts while
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
154 relocation
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
155 ---------------------------------------------------------------------------
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
156
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
157 $ echo babar > c
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
158 $ hg add c
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
159 $ hg amend
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
160 $ hg glog
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
161 @ 8:8fd1c4bd144c added d
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
162 | () draft
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
163 | * 5:e49523854bc8 added d
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
164 | | () draft
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
165 | o 3:ca1b80f7960a added c
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
166 | | () draft
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
167 | o 2:b1661037fa25 added b
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
168 |/ () draft
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
169 o 1:c7586e2a9264 added a
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
170 | () draft
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
171 o 0:8fa14d15e168 added hgignore
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
172 () draft
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
173
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
174 $ hg evolve --content-divergent
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
175 merge:[5] added d
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
176 with: [8] added d
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
177 base: [4] added d
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
178 rebasing "other" content-divergent changeset 8fd1c4bd144c on ca1b80f7960a
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
179 merging c
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
180 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
3853
796334340cad evolve: make one missed error to align other error messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
181 fix conflicts and see `hg help evolve.interrupted`
796334340cad evolve: make one missed error to align other error messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
182 [1]
3828
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
183
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
184 $ hg diff
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
185 diff -r ca1b80f7960a c
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
186 --- a/c Thu Jan 01 00:00:00 1970 +0000
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
187 +++ b/c Thu Jan 01 00:00:00 1970 +0000
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
188 @@ -1,1 +1,5 @@
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
189 +<<<<<<< destination: ca1b80f7960a - test: added c
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
190 foo
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
191 +=======
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
192 +babar
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
193 +>>>>>>> evolving: 8fd1c4bd144c - test: added d
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
194 diff -r ca1b80f7960a d
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
195 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
196 +++ b/d Thu Jan 01 00:00:00 1970 +0000
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
197 @@ -0,0 +1,1 @@
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
198 +foobar
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
199
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
200 $ hg evolve --stop
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
201 stopped the interrupted evolve
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
202 working directory is now at ca1b80f7960a
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
203
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
204 XXX: we should have preserved the wdir to be at rev 8
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
205 $ hg glog
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
206 * 8:8fd1c4bd144c added d
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
207 | () draft
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
208 | * 5:e49523854bc8 added d
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
209 | | () draft
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
210 | @ 3:ca1b80f7960a added c
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
211 | | () draft
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
212 | o 2:b1661037fa25 added b
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
213 |/ () draft
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
214 o 1:c7586e2a9264 added a
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
215 | () draft
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
216 o 0:8fa14d15e168 added hgignore
c58ebf5d2f57 tests: add more test of --stop while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3827
diff changeset
217 () draft