equal
deleted
inserted
replaced
299 3) When stabilizing other changesets resulted in orphan merge changeset |
299 3) When stabilizing other changesets resulted in orphan merge changeset |
300 ----------------------------------------------------------------------- |
300 ----------------------------------------------------------------------- |
301 |
301 |
302 $ hg prune -r d0f84b25d4e3 -r 928097d0b5b5 -r dc1948a6eeab |
302 $ hg prune -r d0f84b25d4e3 -r 928097d0b5b5 -r dc1948a6eeab |
303 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
303 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
304 working directory now at 8fa14d15e168 |
304 working directory is now at 8fa14d15e168 |
305 3 changesets pruned |
305 3 changesets pruned |
306 |
306 |
307 $ for ch in l m; do echo foo > $ch; hg ci -Aqm "added "$ch; done; |
307 $ for ch in l m; do echo foo > $ch; hg ci -Aqm "added "$ch; done; |
308 $ hg up 8fa14d15e168 |
308 $ hg up 8fa14d15e168 |
309 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
309 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
369 4) When both the parents of the merge changeset are obsolete with a succ |
369 4) When both the parents of the merge changeset are obsolete with a succ |
370 ------------------------------------------------------------------------ |
370 ------------------------------------------------------------------------ |
371 |
371 |
372 $ hg prune -r a446ad3e6700 -r 495d2039f8f1 -r 863d11043c67 |
372 $ hg prune -r a446ad3e6700 -r 495d2039f8f1 -r 863d11043c67 |
373 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
373 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
374 working directory now at fccc9de66799 |
374 working directory is now at fccc9de66799 |
375 3 changesets pruned |
375 3 changesets pruned |
376 |
376 |
377 $ hg glog |
377 $ hg glog |
378 @ 20:fccc9de66799 added l |
378 @ 20:fccc9de66799 added l |
379 | () draft |
379 | () draft |
541 7) When one parent is pruned without successor and has no parent |
541 7) When one parent is pruned without successor and has no parent |
542 ---------------------------------------------------------------- |
542 ---------------------------------------------------------------- |
543 |
543 |
544 $ hg prune -r . |
544 $ hg prune -r . |
545 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
545 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
546 working directory now at 8fa14d15e168 |
546 working directory is now at 8fa14d15e168 |
547 1 changesets pruned |
547 1 changesets pruned |
548 $ hg up null |
548 $ hg up null |
549 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
549 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
550 |
550 |
551 $ echo foo > foo |
551 $ echo foo > foo |