68 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
68 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
69 [3] added c |
69 [3] added c |
70 $ echo bar > d |
70 $ echo bar > d |
71 $ hg add d |
71 $ hg add d |
72 $ hg amend |
72 $ hg amend |
73 1 new orphan changesets |
73 1 new unstable changesets |
74 $ hg glog |
74 $ hg glog |
75 @ 5:cb6a2ab625bb added c |
75 @ 6:cb6a2ab625bb added c |
76 | () draft |
76 | () draft |
77 | o 4:c41c793e0ef1 added d |
77 | o 4:c41c793e0ef1 added d |
78 | | () draft |
78 | | () draft |
79 | x 3:ca1b80f7960a added c |
79 | x 3:ca1b80f7960a added c |
80 |/ () draft |
80 |/ () draft |
131 Testing the stop flag in case conflicts are caused by `hg next --evolve` |
131 Testing the stop flag in case conflicts are caused by `hg next --evolve` |
132 ======================================================================== |
132 ======================================================================== |
133 |
133 |
134 $ hg next --evolve |
134 $ hg next --evolve |
135 move:[4] added d |
135 move:[4] added d |
136 atop:[5] added c |
136 atop:[6] added c |
137 merging d |
137 merging d |
138 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
138 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
139 fix conflicts and see `hg help evolve.interrupted` |
139 fix conflicts and see `hg help evolve.interrupted` |
140 [1] |
140 [1] |
141 |
141 |
153 $ hg evolve --stop |
153 $ hg evolve --stop |
154 stopped the interrupted evolve |
154 stopped the interrupted evolve |
155 working directory is now at cb6a2ab625bb |
155 working directory is now at cb6a2ab625bb |
156 |
156 |
157 $ hg glog |
157 $ hg glog |
158 @ 5:cb6a2ab625bb added c |
158 @ 6:cb6a2ab625bb added c |
159 | () draft |
159 | () draft |
160 | o 4:c41c793e0ef1 added d |
160 | o 4:c41c793e0ef1 added d |
161 | | () draft |
161 | | () draft |
162 | x 3:ca1b80f7960a added c |
162 | x 3:ca1b80f7960a added c |
163 |/ () draft |
163 |/ () draft |
178 we do `evolve --stop` |
178 we do `evolve --stop` |
179 -------------------------------------------------------------------------------- |
179 -------------------------------------------------------------------------------- |
180 |
180 |
181 $ hg evolve |
181 $ hg evolve |
182 move:[4] added d |
182 move:[4] added d |
183 atop:[5] added c |
183 atop:[6] added c |
184 merging d |
184 merging d |
185 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
185 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
186 fix conflicts and see `hg help evolve.interrupted` |
186 fix conflicts and see `hg help evolve.interrupted` |
187 [1] |
187 [1] |
188 $ echo foo > d |
188 $ echo foo > d |
191 continue: hg evolve --continue |
191 continue: hg evolve --continue |
192 $ hg evolve --continue |
192 $ hg evolve --continue |
193 evolving 4:c41c793e0ef1 "added d" |
193 evolving 4:c41c793e0ef1 "added d" |
194 working directory is now at 2a4e03d422e2 |
194 working directory is now at 2a4e03d422e2 |
195 $ hg glog |
195 $ hg glog |
196 @ 6:2a4e03d422e2 added d |
196 @ 7:2a4e03d422e2 added d |
197 | () draft |
197 | () draft |
198 o 5:cb6a2ab625bb added c |
198 o 6:cb6a2ab625bb added c |
199 | () draft |
199 | () draft |
200 o 2:b1661037fa25 added b |
200 o 2:b1661037fa25 added b |
201 | () draft |
201 | () draft |
202 o 1:c7586e2a9264 added a |
202 o 1:c7586e2a9264 added a |
203 | () draft |
203 | () draft |
207 $ hg up .^^^^ |
207 $ hg up .^^^^ |
208 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
208 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
209 $ echo bar > c |
209 $ echo bar > c |
210 $ hg add c |
210 $ hg add c |
211 $ hg amend |
211 $ hg amend |
212 4 new orphan changesets |
212 4 new unstable changesets |
213 |
213 |
214 $ hg glog |
214 $ hg glog |
215 @ 7:21817cd42526 added hgignore |
215 @ 9:21817cd42526 added hgignore |
216 () draft |
216 () draft |
217 o 6:2a4e03d422e2 added d |
217 o 7:2a4e03d422e2 added d |
218 | () draft |
218 | () draft |
219 o 5:cb6a2ab625bb added c |
219 o 6:cb6a2ab625bb added c |
220 | () draft |
220 | () draft |
221 o 2:b1661037fa25 added b |
221 o 2:b1661037fa25 added b |
222 | () draft |
222 | () draft |
223 o 1:c7586e2a9264 added a |
223 o 1:c7586e2a9264 added a |
224 | () draft |
224 | () draft |
225 x 0:8fa14d15e168 added hgignore |
225 x 0:8fa14d15e168 added hgignore |
226 () draft |
226 () draft |
227 |
227 |
228 $ hg evolve --all |
228 $ hg evolve --all |
229 move:[1] added a |
229 move:[1] added a |
230 atop:[7] added hgignore |
230 atop:[9] added hgignore |
231 move:[2] added b |
231 move:[2] added b |
232 atop:[8] added a |
232 atop:[10] added a |
233 move:[5] added c |
233 move:[6] added c |
234 atop:[9] added b |
234 atop:[11] added b |
235 merging c |
235 merging c |
236 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
236 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
237 fix conflicts and see `hg help evolve.interrupted` |
237 fix conflicts and see `hg help evolve.interrupted` |
238 [1] |
238 [1] |
239 |
239 |
245 stopped the interrupted evolve |
245 stopped the interrupted evolve |
246 working directory is now at aec285328e90 |
246 working directory is now at aec285328e90 |
247 |
247 |
248 Only changeset which has a successor now are obsoleted |
248 Only changeset which has a successor now are obsoleted |
249 $ hg glog |
249 $ hg glog |
250 @ 9:aec285328e90 added b |
250 @ 11:aec285328e90 added b |
251 | () draft |
251 | () draft |
252 o 8:fd00db71edca added a |
252 o 10:fd00db71edca added a |
253 | () draft |
253 | () draft |
254 o 7:21817cd42526 added hgignore |
254 o 9:21817cd42526 added hgignore |
255 () draft |
255 () draft |
256 o 6:2a4e03d422e2 added d |
256 o 7:2a4e03d422e2 added d |
257 | () draft |
257 | () draft |
258 o 5:cb6a2ab625bb added c |
258 o 6:cb6a2ab625bb added c |
259 | () draft |
259 | () draft |
260 x 2:b1661037fa25 added b |
260 x 2:b1661037fa25 added b |
261 | () draft |
261 | () draft |
262 x 1:c7586e2a9264 added a |
262 x 1:c7586e2a9264 added a |
263 | () draft |
263 | () draft |
265 () draft |
265 () draft |
266 |
266 |
267 Making sure doing evolve again resumes from right place and does the right thing |
267 Making sure doing evolve again resumes from right place and does the right thing |
268 |
268 |
269 $ hg evolve --all |
269 $ hg evolve --all |
270 move:[5] added c |
270 move:[6] added c |
271 atop:[9] added b |
271 atop:[11] added b |
272 merging c |
272 merging c |
273 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
273 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
274 fix conflicts and see `hg help evolve.interrupted` |
274 fix conflicts and see `hg help evolve.interrupted` |
275 [1] |
275 [1] |
276 |
276 |
277 $ echo foobar > c |
277 $ echo foobar > c |
278 $ hg resolve -m |
278 $ hg resolve -m |
279 (no more unresolved files) |
279 (no more unresolved files) |
280 continue: hg evolve --continue |
280 continue: hg evolve --continue |
281 $ hg evolve --continue |
281 $ hg evolve --continue |
282 evolving 5:cb6a2ab625bb "added c" |
282 evolving 6:cb6a2ab625bb "added c" |
283 move:[6] added d |
283 move:[7] added d |
284 atop:[10] added c |
284 atop:[12] added c |
285 working directory is now at cd0909a30222 |
285 working directory is now at cd0909a30222 |
286 $ hg glog |
286 $ hg glog |
287 @ 11:cd0909a30222 added d |
287 @ 13:cd0909a30222 added d |
288 | () draft |
288 | () draft |
289 o 10:cb1dd1086ef6 added c |
289 o 12:cb1dd1086ef6 added c |
290 | () draft |
290 | () draft |
291 o 9:aec285328e90 added b |
291 o 11:aec285328e90 added b |
292 | () draft |
292 | () draft |
293 o 8:fd00db71edca added a |
293 o 10:fd00db71edca added a |
294 | () draft |
294 | () draft |
295 o 7:21817cd42526 added hgignore |
295 o 9:21817cd42526 added hgignore |
296 () draft |
296 () draft |
297 |
297 |
298 Bookmarks should only be moved of the changesets which have been evolved, |
298 Bookmarks should only be moved of the changesets which have been evolved, |
299 bookmarks of rest of them should stay where they are are |
299 bookmarks of rest of them should stay where they are are |
300 ------------------------------------------------------------------------- |
300 ------------------------------------------------------------------------- |
306 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
306 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
307 (leaving bookmark b1) |
307 (leaving bookmark b1) |
308 $ hg bookmark b2 |
308 $ hg bookmark b2 |
309 |
309 |
310 $ hg glog |
310 $ hg glog |
311 o 11:cd0909a30222 added d |
311 o 13:cd0909a30222 added d |
312 | () draft |
312 | () draft |
313 o 10:cb1dd1086ef6 added c |
313 o 12:cb1dd1086ef6 added c |
314 | (b1) draft |
314 | (b1) draft |
315 @ 9:aec285328e90 added b |
315 @ 11:aec285328e90 added b |
316 | (b2) draft |
316 | (b2) draft |
317 o 8:fd00db71edca added a |
317 o 10:fd00db71edca added a |
318 | () draft |
318 | () draft |
319 o 7:21817cd42526 added hgignore |
319 o 9:21817cd42526 added hgignore |
320 () draft |
320 () draft |
321 |
321 |
322 $ hg prev |
322 $ hg prev |
323 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
323 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
324 [8] added a |
324 [10] added a |
325 $ echo tom > c |
325 $ echo tom > c |
326 $ hg amend |
326 $ hg amend |
327 3 new orphan changesets |
327 3 new unstable changesets |
328 |
328 |
329 $ hg glog |
329 $ hg glog |
330 @ 12:a3cc2042492f added a |
330 @ 15:a3cc2042492f added a |
331 | () draft |
331 | () draft |
332 | o 11:cd0909a30222 added d |
332 | o 13:cd0909a30222 added d |
333 | | () draft |
333 | | () draft |
334 | o 10:cb1dd1086ef6 added c |
334 | o 12:cb1dd1086ef6 added c |
335 | | (b1) draft |
335 | | (b1) draft |
336 | o 9:aec285328e90 added b |
336 | o 11:aec285328e90 added b |
337 | | (b2) draft |
337 | | (b2) draft |
338 | x 8:fd00db71edca added a |
338 | x 10:fd00db71edca added a |
339 |/ () draft |
339 |/ () draft |
340 o 7:21817cd42526 added hgignore |
340 o 9:21817cd42526 added hgignore |
341 () draft |
341 () draft |
342 |
342 |
343 $ hg evolve --all |
343 $ hg evolve --all |
344 move:[9] added b |
344 move:[11] added b |
345 atop:[12] added a |
345 atop:[15] added a |
346 move:[10] added c |
346 move:[12] added c |
347 atop:[13] added b |
347 atop:[16] added b |
348 merging c |
348 merging c |
349 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
349 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
350 fix conflicts and see `hg help evolve.interrupted` |
350 fix conflicts and see `hg help evolve.interrupted` |
351 [1] |
351 [1] |
352 |
352 |
354 stopped the interrupted evolve |
354 stopped the interrupted evolve |
355 working directory is now at a3f4b95da934 |
355 working directory is now at a3f4b95da934 |
356 |
356 |
357 Bookmarks of only the changeset which are evolved is moved |
357 Bookmarks of only the changeset which are evolved is moved |
358 $ hg glog |
358 $ hg glog |
359 @ 13:a3f4b95da934 added b |
359 @ 16:a3f4b95da934 added b |
360 | (b2) draft |
360 | (b2) draft |
361 o 12:a3cc2042492f added a |
361 o 15:a3cc2042492f added a |
362 | () draft |
362 | () draft |
363 | o 11:cd0909a30222 added d |
363 | o 13:cd0909a30222 added d |
364 | | () draft |
364 | | () draft |
365 | o 10:cb1dd1086ef6 added c |
365 | o 12:cb1dd1086ef6 added c |
366 | | (b1) draft |
366 | | (b1) draft |
367 | x 9:aec285328e90 added b |
367 | x 11:aec285328e90 added b |
368 | | () draft |
368 | | () draft |
369 | x 8:fd00db71edca added a |
369 | x 10:fd00db71edca added a |
370 |/ () draft |
370 |/ () draft |
371 o 7:21817cd42526 added hgignore |
371 o 9:21817cd42526 added hgignore |
372 () draft |
372 () draft |