291 continue: hg evolve --continue |
291 continue: hg evolve --continue |
292 $ hg evolve --continue |
292 $ hg evolve --continue |
293 evolving 5:cb6a2ab625bb "added c" |
293 evolving 5:cb6a2ab625bb "added c" |
294 move:[6] added d |
294 move:[6] added d |
295 atop:[10] added c |
295 atop:[10] added c |
296 working directory is now at cd0909a30222 |
296 working directory is now at aec285328e90 |
297 $ hg glog |
297 $ hg glog |
298 @ 11:cd0909a30222 added d |
298 o 11:cd0909a30222 added d |
299 | () draft |
299 | () draft |
300 o 10:cb1dd1086ef6 added c |
300 o 10:cb1dd1086ef6 added c |
301 | () draft |
301 | () draft |
302 o 9:aec285328e90 added b |
302 @ 9:aec285328e90 added b |
303 | () draft |
303 | () draft |
304 o 8:fd00db71edca added a |
304 o 8:fd00db71edca added a |
305 | () draft |
305 | () draft |
306 o 7:21817cd42526 added hgignore |
306 o 7:21817cd42526 added hgignore |
307 () draft |
307 () draft |
308 |
308 |
309 Bookmarks should only be moved of the changesets which have been evolved, |
309 Bookmarks should only be moved of the changesets which have been evolved, |
310 bookmarks of rest of them should stay where they are are |
310 bookmarks of rest of them should stay where they are are |
311 ------------------------------------------------------------------------- |
311 ------------------------------------------------------------------------- |
312 |
312 |
313 $ hg up .^ |
313 $ hg up tip^ |
314 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
314 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
315 $ hg bookmark b1 |
315 $ hg bookmark b1 |
316 $ hg up .^ |
316 $ hg up .^ |
317 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
317 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
318 (leaving bookmark b1) |
318 (leaving bookmark b1) |
319 $ hg bookmark b2 |
319 $ hg bookmark b2 |