equal
deleted
inserted
replaced
629 $ hg commit -Am b |
629 $ hg commit -Am b |
630 adding b |
630 adding b |
631 $ hg book foo |
631 $ hg book foo |
632 $ hg rebase -d 0 -r "1::2" --collapse -m collapsed |
632 $ hg rebase -d 0 -r "1::2" --collapse -m collapsed |
633 rebasing 1:6d8d9f24eec3 "a" |
633 rebasing 1:6d8d9f24eec3 "a" |
634 rebasing 2:1cc73eca5ecc tip foo "b" |
634 rebasing 2:1cc73eca5ecc foo tip "b" |
635 saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg |
635 saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg |
636 $ hg log -G --template "{rev}: '{desc}' {bookmarks}" |
636 $ hg log -G --template "{rev}: '{desc}' {bookmarks}" |
637 @ 1: 'collapsed' foo |
637 @ 1: 'collapsed' foo |
638 | |
638 | |
639 o 0: 'base' |
639 o 0: 'base' |