Mercurial > evolve

comparison tests/test-evolve-continue.t @ 4174:e07e764c0f48 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 12 Oct 2018 15:20:54 +0200
parents 537fd9a86c06 e268f7fd7839
children
comparison
equal deleted inserted replaced
4173:e268f7fd7839 4174:e07e764c0f48
36 $ hg up ca1b80f7960a 36 $ hg up ca1b80f7960a
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
38 $ echo bar > d 38 $ echo bar > d
39 $ hg add d 39 $ hg add d
40 $ hg amend 40 $ hg amend
41 1 new orphan changesets 41 1 new unstable changesets
42 $ hg glog 42 $ hg glog
43 @ 5:cb6a2ab625bb added c 43 @ 6:cb6a2ab625bb added c
44 | () draft 44 | () draft
45 | o 4:c41c793e0ef1 added d 45 | o 4:c41c793e0ef1 added d
46 | | () draft 46 | | () draft
47 | x 3:ca1b80f7960a added c 47 | x 3:ca1b80f7960a added c
48 |/ () draft 48 |/ () draft
53 o 0:8fa14d15e168 added hgignore 53 o 0:8fa14d15e168 added hgignore
54 () draft 54 () draft
55 55
56 $ hg evolve --all 56 $ hg evolve --all
57 move:[4] added d 57 move:[4] added d
58 atop:[5] added c 58 atop:[6] added c
59 merging d 59 merging d
60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
61 fix conflicts and see `hg help evolve.interrupted` 61 fix conflicts and see `hg help evolve.interrupted`
62 [1] 62 [1]
63 63
69 $ hg evolve --continue 69 $ hg evolve --continue
70 evolving 4:c41c793e0ef1 "added d" 70 evolving 4:c41c793e0ef1 "added d"
71 working directory is now at 2a4e03d422e2 71 working directory is now at 2a4e03d422e2
72 72
73 $ hg glog 73 $ hg glog
74 @ 6:2a4e03d422e2 added d 74 @ 7:2a4e03d422e2 added d
75 | () draft 75 | () draft
76 o 5:cb6a2ab625bb added c 76 o 6:cb6a2ab625bb added c
77 | () draft 77 | () draft
78 o 2:b1661037fa25 added b 78 o 2:b1661037fa25 added b
79 | () draft 79 | () draft
80 o 1:c7586e2a9264 added a 80 o 1:c7586e2a9264 added a
81 | () draft 81 | () draft
86 86
87 $ echo foo > e 87 $ echo foo > e
88 $ hg ci -Aqm "added e" 88 $ hg ci -Aqm "added e"
89 $ hg prev 89 $ hg prev
90 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 90 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
91 [6] added d 91 [7] added d
92 $ echo bar > e 92 $ echo bar > e
93 $ hg add e 93 $ hg add e
94 $ hg amend 94 $ hg amend
95 1 new orphan changesets 95 1 new unstable changesets
96 96
97 $ hg glog 97 $ hg glog
98 @ 8:00a5c774cc37 added d 98 @ 10:00a5c774cc37 added d
99 | () draft 99 | () draft
100 | o 7:ad0a59d83efe added e 100 | o 8:ad0a59d83efe added e
101 | | () draft 101 | | () draft
102 | x 6:2a4e03d422e2 added d 102 | x 7:2a4e03d422e2 added d
103 |/ () draft 103 |/ () draft
104 o 5:cb6a2ab625bb added c 104 o 6:cb6a2ab625bb added c
105 | () draft 105 | () draft
106 o 2:b1661037fa25 added b 106 o 2:b1661037fa25 added b
107 | () draft 107 | () draft
108 o 1:c7586e2a9264 added a 108 o 1:c7586e2a9264 added a
109 | () draft 109 | () draft
110 o 0:8fa14d15e168 added hgignore 110 o 0:8fa14d15e168 added hgignore
111 () draft 111 () draft
112 112
113 $ hg evolve 113 $ hg evolve
114 move:[7] added e 114 move:[8] added e
115 atop:[8] added d 115 atop:[10] added d
116 merging e 116 merging e
117 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') 117 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
118 fix conflicts and see `hg help evolve.interrupted` 118 fix conflicts and see `hg help evolve.interrupted`
119 [1] 119 [1]
120 120
123 (no more unresolved files) 123 (no more unresolved files)
124 continue: hg evolve --continue 124 continue: hg evolve --continue
125 $ hg diff 125 $ hg diff
126 126
127 $ hg evolve --continue 127 $ hg evolve --continue
128 evolving 7:ad0a59d83efe "added e" 128 evolving 8:ad0a59d83efe "added e"
129 evolution of 7:ad0a59d83efe created no changes to commit 129 evolution of 8:ad0a59d83efe created no changes to commit
130 130
131 $ hg glog 131 $ hg glog
132 @ 8:00a5c774cc37 added d 132 @ 10:00a5c774cc37 added d
133 | () draft 133 | () draft
134 o 5:cb6a2ab625bb added c 134 o 6:cb6a2ab625bb added c
135 | () draft 135 | () draft
136 o 2:b1661037fa25 added b 136 o 2:b1661037fa25 added b
137 | () draft 137 | () draft
138 o 1:c7586e2a9264 added a 138 o 1:c7586e2a9264 added a
139 | () draft 139 | () draft
145 $ hg up c7586e2a9264 145 $ hg up c7586e2a9264
146 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 146 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
147 $ echo bar > b 147 $ echo bar > b
148 $ hg add b 148 $ hg add b
149 $ hg amend 149 $ hg amend
150 3 new orphan changesets 150 3 new unstable changesets
151 151
152 $ hg evolve --all 152 $ hg evolve --all
153 move:[2] added b 153 move:[2] added b
154 atop:[9] added a 154 atop:[12] added a
155 merging b 155 merging b
156 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 156 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
157 fix conflicts and see `hg help evolve.interrupted` 157 fix conflicts and see `hg help evolve.interrupted`
158 [1] 158 [1]
159 159
161 $ hg resolve -m 161 $ hg resolve -m
162 (no more unresolved files) 162 (no more unresolved files)
163 continue: hg evolve --continue 163 continue: hg evolve --continue
164 $ hg evolve --continue 164 $ hg evolve --continue
165 evolving 2:b1661037fa25 "added b" 165 evolving 2:b1661037fa25 "added b"
166 move:[5] added c 166 move:[6] added c
167 atop:[10] added b 167 atop:[13] added b
168 move:[8] added d 168 move:[10] added d
169 working directory is now at 6642d2c9176e 169 working directory is now at 6642d2c9176e
170 170
171 $ hg glog 171 $ hg glog
172 @ 12:6642d2c9176e added d 172 @ 15:6642d2c9176e added d
173 | () draft 173 | () draft
174 o 11:95665a2de664 added c 174 o 14:95665a2de664 added c
175 | () draft 175 | () draft
176 o 10:87f748868183 added b 176 o 13:87f748868183 added b
177 | () draft 177 | () draft
178 o 9:53b632d203d8 added a 178 o 12:53b632d203d8 added a
179 | () draft 179 | () draft
180 o 0:8fa14d15e168 added hgignore 180 o 0:8fa14d15e168 added hgignore
181 () draft 181 () draft
182 182
183 Conlicts -> resolve -> continue -> conflicts -> resolve -> continue 183 Conlicts -> resolve -> continue -> conflicts -> resolve -> continue
184 Test multiple conflicts in one evolve 184 Test multiple conflicts in one evolve
185 185
186 $ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done; 186 $ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done;
187 187
188 $ hg glog 188 $ hg glog
189 @ 15:09becba8f97d added h 189 @ 18:09becba8f97d added h
190 | () draft 190 | () draft
191 o 14:5aa7b2bbd944 added g 191 o 17:5aa7b2bbd944 added g
192 | () draft 192 | () draft
193 o 13:be88f889b6dc added f 193 o 16:be88f889b6dc added f
194 | () draft 194 | () draft
195 o 12:6642d2c9176e added d 195 o 15:6642d2c9176e added d
196 | () draft 196 | () draft
197 o 11:95665a2de664 added c 197 o 14:95665a2de664 added c
198 | () draft 198 | () draft
199 o 10:87f748868183 added b 199 o 13:87f748868183 added b
200 | () draft 200 | () draft
201 o 9:53b632d203d8 added a 201 o 12:53b632d203d8 added a
202 | () draft 202 | () draft
203 o 0:8fa14d15e168 added hgignore 203 o 0:8fa14d15e168 added hgignore
204 () draft 204 () draft
205 205
206 $ hg up 95665a2de664 206 $ hg up 95665a2de664
208 208
209 $ echo bar > f 209 $ echo bar > f
210 $ echo bar > h 210 $ echo bar > h
211 $ hg add f h 211 $ hg add f h
212 $ hg amend 212 $ hg amend
213 4 new orphan changesets 213 4 new unstable changesets
214 214
215 $ hg glog 215 $ hg glog
216 @ 16:645135c5caa4 added c 216 @ 20:645135c5caa4 added c
217 | () draft 217 | () draft
218 | o 15:09becba8f97d added h 218 | o 18:09becba8f97d added h
219 | | () draft 219 | | () draft
220 | o 14:5aa7b2bbd944 added g 220 | o 17:5aa7b2bbd944 added g
221 | | () draft 221 | | () draft
222 | o 13:be88f889b6dc added f 222 | o 16:be88f889b6dc added f
223 | | () draft 223 | | () draft
224 | o 12:6642d2c9176e added d 224 | o 15:6642d2c9176e added d
225 | | () draft 225 | | () draft
226 | x 11:95665a2de664 added c 226 | x 14:95665a2de664 added c
227 |/ () draft 227 |/ () draft
228 o 10:87f748868183 added b 228 o 13:87f748868183 added b
229 | () draft 229 | () draft
230 o 9:53b632d203d8 added a 230 o 12:53b632d203d8 added a
231 | () draft 231 | () draft
232 o 0:8fa14d15e168 added hgignore 232 o 0:8fa14d15e168 added hgignore
233 () draft 233 () draft
234 234
235 $ hg evolve --all 235 $ hg evolve --all
236 move:[12] added d 236 move:[15] added d
237 atop:[16] added c 237 atop:[20] added c
238 move:[13] added f 238 move:[16] added f
239 merging f 239 merging f
240 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') 240 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
241 fix conflicts and see `hg help evolve.interrupted` 241 fix conflicts and see `hg help evolve.interrupted`
242 [1] 242 [1]
243 243
244 $ echo foo > f 244 $ echo foo > f
245 $ hg resolve -m 245 $ hg resolve -m
246 (no more unresolved files) 246 (no more unresolved files)
247 continue: hg evolve --continue 247 continue: hg evolve --continue
248 $ hg evolve --continue 248 $ hg evolve --continue
249 evolving 13:be88f889b6dc "added f" 249 evolving 16:be88f889b6dc "added f"
250 move:[14] added g 250 move:[17] added g
251 atop:[18] added f 251 atop:[22] added f
252 move:[15] added h 252 move:[18] added h
253 merging h 253 merging h
254 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') 254 warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
255 fix conflicts and see `hg help evolve.interrupted` 255 fix conflicts and see `hg help evolve.interrupted`
256 [1] 256 [1]
257 257
258 $ echo foo > h 258 $ echo foo > h
259 $ hg resolve -m 259 $ hg resolve -m
260 (no more unresolved files) 260 (no more unresolved files)
261 continue: hg evolve --continue 261 continue: hg evolve --continue
262 $ hg evolve --continue 262 $ hg evolve --continue
263 evolving 15:09becba8f97d "added h" 263 evolving 18:09becba8f97d "added h"
264 working directory is now at 3ba9d3d1b089 264 working directory is now at 3ba9d3d1b089
265 265
266 Make sure, confirmopt is respected while continue 266 Make sure, confirmopt is respected while continue
267 267
268 $ hg glog 268 $ hg glog
269 @ 20:3ba9d3d1b089 added h 269 @ 24:3ba9d3d1b089 added h
270 | () draft 270 | () draft
271 o 19:981e615b14ca added g 271 o 23:981e615b14ca added g
272 | () draft 272 | () draft
273 o 18:5794f1a3cbb2 added f 273 o 22:5794f1a3cbb2 added f
274 | () draft 274 | () draft
275 o 17:e47537da02b3 added d 275 o 21:e47537da02b3 added d
276 | () draft 276 | () draft
277 o 16:645135c5caa4 added c 277 o 20:645135c5caa4 added c
278 | () draft 278 | () draft
279 o 10:87f748868183 added b 279 o 13:87f748868183 added b
280 | () draft 280 | () draft
281 o 9:53b632d203d8 added a 281 o 12:53b632d203d8 added a
282 | () draft 282 | () draft
283 o 0:8fa14d15e168 added hgignore 283 o 0:8fa14d15e168 added hgignore
284 () draft 284 () draft
285 285
286 $ hg up 5794f1a3cbb2 286 $ hg up 5794f1a3cbb2
287 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 287 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
288 $ echo bar > g 288 $ echo bar > g
289 $ hg add g 289 $ hg add g
290 $ hg amend 290 $ hg amend
291 2 new orphan changesets 291 2 new unstable changesets
292 292
293 $ hg evolve --all --confirm<<EOF 293 $ hg evolve --all --confirm<<EOF
294 > y 294 > y
295 > EOF 295 > EOF
296 move:[19] added g 296 move:[23] added g
297 atop:[21] added f 297 atop:[26] added f
298 perform evolve? [Ny] y 298 perform evolve? [Ny] y
299 merging g 299 merging g
300 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') 300 warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
301 fix conflicts and see `hg help evolve.interrupted` 301 fix conflicts and see `hg help evolve.interrupted`
302 [1] 302 [1]
309 XXX: this should have asked for confirmation 309 XXX: this should have asked for confirmation
310 310
311 $ hg evolve --continue<<EOF 311 $ hg evolve --continue<<EOF
312 > y 312 > y
313 > EOF 313 > EOF
314 evolving 19:981e615b14ca "added g" 314 evolving 23:981e615b14ca "added g"
315 move:[20] added h 315 move:[24] added h
316 atop:[22] added g 316 atop:[27] added g
317 perform evolve? [Ny] y 317 perform evolve? [Ny] y
318 working directory is now at af6bd002a48d 318 working directory is now at af6bd002a48d
319 319
320 $ hg glog 320 $ hg glog
321 @ 23:af6bd002a48d added h 321 @ 28:af6bd002a48d added h
322 | () draft 322 | () draft
323 o 22:d2c94a8f44bd added g 323 o 27:d2c94a8f44bd added g
324 | () draft 324 | () draft
325 o 21:9849fa96c885 added f 325 o 26:9849fa96c885 added f
326 | () draft 326 | () draft
327 o 17:e47537da02b3 added d 327 o 21:e47537da02b3 added d
328 | () draft 328 | () draft
329 o 16:645135c5caa4 added c 329 o 20:645135c5caa4 added c
330 | () draft 330 | () draft
331 o 10:87f748868183 added b 331 o 13:87f748868183 added b
332 | () draft 332 | () draft
333 o 9:53b632d203d8 added a 333 o 12:53b632d203d8 added a
334 | () draft 334 | () draft
335 o 0:8fa14d15e168 added hgignore 335 o 0:8fa14d15e168 added hgignore
336 () draft 336 () draft
337 337
338 Testing `evolve --continue` after `hg next --evolve` 338 Testing `evolve --continue` after `hg next --evolve`
339 339
340 $ hg up .^^ 340 $ hg up .^^
341 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 341 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
342 $ echo foobar > g 342 $ echo foobar > g
343 $ hg amend 343 $ hg amend
344 2 new orphan changesets 344 2 new unstable changesets
345 345
346 $ hg next --evolve 346 $ hg next --evolve
347 move:[22] added g 347 move:[27] added g
348 atop:[24] added f 348 atop:[30] added f
349 merging g 349 merging g
350 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') 350 warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
351 fix conflicts and see `hg help evolve.interrupted` 351 fix conflicts and see `hg help evolve.interrupted`
352 [1] 352 [1]
353 $ echo foo > g 353 $ echo foo > g
354 $ hg resolve -m 354 $ hg resolve -m
355 (no more unresolved files) 355 (no more unresolved files)
356 continue: hg evolve --continue 356 continue: hg evolve --continue
357 $ hg evolve --continue 357 $ hg evolve --continue
358 evolving 22:d2c94a8f44bd "added g" 358 evolving 27:d2c94a8f44bd "added g"