equal
deleted
inserted
replaced
51 |
51 |
52 $ hg up -q -C 2 |
52 $ hg up -q -C 2 |
53 |
53 |
54 $ hg rebase |
54 $ hg rebase |
55 rebasing 2:87c180a611f2 "l1" |
55 rebasing 2:87c180a611f2 "l1" |
56 saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-backup.hg (glob) |
56 saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg (glob) |
57 |
57 |
58 $ hg tglog |
58 $ hg tglog |
59 @ 4: 'l1' |
59 @ 4: 'l1' |
60 | |
60 | |
61 o 3: 'r2' |
61 o 3: 'r2' |
111 $ hg up -q -C 3 |
111 $ hg up -q -C 3 |
112 |
112 |
113 $ hg rebase |
113 $ hg rebase |
114 rebasing 2:87c180a611f2 "l1" |
114 rebasing 2:87c180a611f2 "l1" |
115 rebasing 3:1ac923b736ef "l2" |
115 rebasing 3:1ac923b736ef "l2" |
116 saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-backup.hg (glob) |
116 saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg (glob) |
117 |
117 |
118 $ hg tglog |
118 $ hg tglog |
119 @ 4: 'l2' |
119 @ 4: 'l2' |
120 | |
120 | |
121 o 3: 'l1' |
121 o 3: 'l1' |