equal
deleted
inserted
replaced
1529 rebasing 2:1e9a3c00cbe9 "b" (tip) |
1529 rebasing 2:1e9a3c00cbe9 "b" (tip) |
1530 $ hg log -r . # working dir is at rev 3 (successor of 2) |
1530 $ hg log -r . # working dir is at rev 3 (successor of 2) |
1531 3:be1832deae9a b (no-eol) |
1531 3:be1832deae9a b (no-eol) |
1532 $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now |
1532 $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now |
1533 bookmarking hidden changeset 1e9a3c00cbe9 |
1533 bookmarking hidden changeset 1e9a3c00cbe9 |
|
1534 (hidden revision '1e9a3c00cbe9' was rewritten as: be1832deae9a) |
1534 $ hg up 2 && hg log -r . # working dir is at rev 2 again |
1535 $ hg up 2 && hg log -r . # working dir is at rev 2 again |
1535 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1536 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1536 2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol) |
1537 2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol) |
1537 $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 |
1538 $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 |
1538 note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip) |
1539 note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip) |