equal
deleted
inserted
replaced
36 adding d |
36 adding d |
37 created new head |
37 created new head |
38 |
38 |
39 $ hg book W |
39 $ hg book W |
40 |
40 |
41 $ hg tglog |
41 $ hg tglog |
42 @ 3: 'D' bookmarks: W |
42 @ 3: 'D' bookmarks: W |
43 | |
43 | |
44 | o 2: 'C' bookmarks: Y Z |
44 | o 2: 'C' bookmarks: Y Z |
45 | | |
45 | | |
46 | o 1: 'B' bookmarks: X |
46 | o 1: 'B' bookmarks: X |
57 $ hg up -q Z |
57 $ hg up -q Z |
58 |
58 |
59 $ hg rebase -s Y -d 3 |
59 $ hg rebase -s Y -d 3 |
60 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
60 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
61 |
61 |
62 $ hg tglog |
62 $ hg tglog |
63 @ 3: 'C' bookmarks: Y Z |
63 @ 3: 'C' bookmarks: Y Z |
64 | |
64 | |
65 o 2: 'D' bookmarks: W |
65 o 2: 'D' bookmarks: W |
66 | |
66 | |
67 | o 1: 'B' bookmarks: X |
67 | o 1: 'B' bookmarks: X |
77 $ hg up -q Z |
77 $ hg up -q Z |
78 |
78 |
79 $ hg rebase -s 1 -d 3 |
79 $ hg rebase -s 1 -d 3 |
80 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
80 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
81 |
81 |
82 $ hg tglog |
82 $ hg tglog |
83 @ 3: 'C' bookmarks: Y Z |
83 @ 3: 'C' bookmarks: Y Z |
84 | |
84 | |
85 o 2: 'B' bookmarks: X |
85 o 2: 'B' bookmarks: X |
86 | |
86 | |
87 o 1: 'D' bookmarks: W |
87 o 1: 'D' bookmarks: W |