Mercurial > evolve

comparison tests/test-unstable.t @ 3593:b92114f201c9 mercurial-4.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.2 into mercurial-4.1
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 16:35:18 +0100
parents 98941c28f3e2
children
comparison
equal deleted inserted replaced
3592:7a5c3175015e 3593:b92114f201c9
66 66
67 67
68 $ cd .. 68 $ cd ..
69 69
70 =============================================================================== 70 ===============================================================================
71 Test instability resolution for a merge changeset unstable because one
72 of its parent is obsolete
73 Not supported yet
74 ==============================================================================
75
76 $ hg init test2
77 $ cd test2
78 $ mkcommit base
79 $ mkcommits _a
80 $ hg up "desc(base)"
81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
82 $ mkcommit _c
83 created new head
84 $ hg merge "desc(_a)" >/dev/null
85 $ hg commit -m "merge"
86 $ hg up "desc(_a)"
87 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
88 $ hg amend -m "aprime"
89 1 new unstable changesets
90 $ hg log -G
91 @ 4:47127ea62e5f@default(draft) aprime
92 |
93 | o 3:6b4280e33286@default(draft) merge
94 | |\
95 +---o 2:474da87dd33b@default(draft) add _c
96 | |
97 | x 1:b3264cec9506@default(draft) add _a
98 |/
99 o 0:b4952fcf48cf@default(draft) add base
100
101
102 $ hg evo --all --any --orphan
103 move:[3] merge
104 atop:[4] aprime
105 working directory is now at 0bf3f3a59c8c
106 $ hg log -G
107 @ 5:0bf3f3a59c8c@default(draft) merge
108 |\
109 | o 4:47127ea62e5f@default(draft) aprime
110 | |
111 o | 2:474da87dd33b@default(draft) add _c
112 |/
113 o 0:b4952fcf48cf@default(draft) add base
114
115
116 $ cd ..
117
118 ===============================================================================
119 Test instability resolution for a merge changeset unstable because both
120 of its parent are obsolete
121 Not supported yet
122 ==============================================================================
123
124 $ hg init test3
125 $ cd test3
126 $ mkcommit base
127 $ mkcommits _a
128 $ hg up "desc(base)"
129 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
130 $ mkcommit _c
131 created new head
132 $ hg merge "desc(_a)" >/dev/null
133 $ hg commit -m "merge"
134 $ hg up "desc(_a)"
135 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
136 $ hg amend -m "aprime"
137 1 new unstable changesets
138 $ hg up "desc(_c)"
139 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
140 $ hg amend -m "cprime"
141 $ hg log -G
142 @ 5:2db39fda7e2f@default(draft) cprime
143 |
144 | o 4:47127ea62e5f@default(draft) aprime
145 |/
146 | o 3:6b4280e33286@default(draft) merge
147 | |\
148 +---x 2:474da87dd33b@default(draft) add _c
149 | |
150 | x 1:b3264cec9506@default(draft) add _a
151 |/
152 o 0:b4952fcf48cf@default(draft) add base
153
154
155 $ hg evo --all --any --orphan
156 move:[3] merge
157 atop:[4] aprime
158 move:[6] merge
159 atop:[5] cprime
160 working directory is now at 2d30b910830b
161 $ hg log -G
162 @ 7:2d30b910830b@default(draft) merge
163 |\
164 | o 5:2db39fda7e2f@default(draft) cprime
165 | |
166 o | 4:47127ea62e5f@default(draft) aprime
167 |/
168 o 0:b4952fcf48cf@default(draft) add base
169
170
171 $ cd ..
172
173 ===============================================================================
174 Test instability resolution for a changeset unstable because its parent
175 is obsolete with multiple successors all in one chain (simple split)
176 ==============================================================================
177
178 $ hg init test4
179 $ cd test4
180 $ mkcommits _a _b _c
181 $ hg up "desc(_a)"
182 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
183 $ mkcommits bprimesplit1 bprimesplit2
184 created new head
185 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
186 1 changesets pruned
187 1 new unstable changesets
188 $ hg log -G
189 @ 4:2a4ccc0bb20c@default(draft) add bprimesplit2
190 |
191 o 3:8b87864bd0f4@default(draft) add bprimesplit1
192 |
193 | o 2:102002290587@default(draft) add _c
194 | |
195 | x 1:37445b16603b@default(draft) add _b
196 |/
197 o 0:135f39f4bd78@default(draft) add _a
198
199
200 $ hg evo --all --any --orphan
201 move:[2] add _c
202 atop:[4] add bprimesplit2
203 working directory is now at 387cc1e837d7
204 $ hg log -G
205 @ 5:387cc1e837d7@default(draft) add _c
206 |
207 o 4:2a4ccc0bb20c@default(draft) add bprimesplit2
208 |
209 o 3:8b87864bd0f4@default(draft) add bprimesplit1
210 |
211 o 0:135f39f4bd78@default(draft) add _a
212
213
214
215 $ cd ..
216
217 ===============================================================================
71 Test instability resolution for a changeset unstable because its parent 218 Test instability resolution for a changeset unstable because its parent
72 is obsolete with multiple successors on one branches but in reverse 219 is obsolete with multiple successors on one branches but in reverse
73 order (cross-split). 220 order (cross-split).
74 ============================================================================== 221 ==============================================================================
75 222
116 o 5:8ffdae67d696@default(draft) add bsecondsplit1 263 o 5:8ffdae67d696@default(draft) add bsecondsplit1
117 | 264 |
118 o 0:135f39f4bd78@default(draft) add _a 265 o 0:135f39f4bd78@default(draft) add _a
119 266
120 267
121 $ cd .. 268
269 $ cd ..
270
271 ===============================================================================
272 Test instability resolution for a changeset unstable because its parent
273 is obsolete with multiple successors on two branches.
274 Not supported yet
275 ==============================================================================
276
277 $ hg init test6
278 $ cd test6
279 $ mkcommits _a _b _c
280 $ hg up "desc(_a)"
281 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
282 $ mkcommit bprimesplit1
283 created new head
284 $ hg up "desc(_a)"
285 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
286 $ mkcommit bprimesplit2
287 created new head
288 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
289 1 changesets pruned
290 1 new unstable changesets
291 $ hg log -G
292 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2
293 |
294 | o 3:8b87864bd0f4@default(draft) add bprimesplit1
295 |/
296 | o 2:102002290587@default(draft) add _c
297 | |
298 | x 1:37445b16603b@default(draft) add _b
299 |/
300 o 0:135f39f4bd78@default(draft) add _a
301
302
303 $ hg evo --all --any --orphan
304 could not solve instability, ambiguous destination: parent split across two branches
305 $ hg log -G
306 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2
307 |
308 | o 3:8b87864bd0f4@default(draft) add bprimesplit1
309 |/
310 | o 2:102002290587@default(draft) add _c
311 | |
312 | x 1:37445b16603b@default(draft) add _b
313 |/
314 o 0:135f39f4bd78@default(draft) add _a
315
316
317
318 $ cd ..
319