equal
deleted
inserted
replaced
117 | |
117 | |
118 o 0 add a |
118 o 0 add a |
119 |
119 |
120 $ hg rebase -d . -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True |
120 $ hg rebase -d . -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True |
121 rebasing 2:6adcf8c12e7d "copy b->x" |
121 rebasing 2:6adcf8c12e7d "copy b->x" |
122 saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-backup.hg (glob) |
122 saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-rebase.hg (glob) |
123 $ hg up -q 3 |
123 $ hg up -q 3 |
124 $ hg log -f x -T '{rev} {desc}\n' |
124 $ hg log -f x -T '{rev} {desc}\n' |
125 3 copy b->x |
125 3 copy b->x |
126 1 add b, c |
126 1 add b, c |
127 |
127 |
150 |/ |
150 |/ |
151 o 0 add a |
151 o 0 add a |
152 |
152 |
153 $ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.disablecopytrace=True |
153 $ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.disablecopytrace=True |
154 rebasing 3:47e1a9e6273b "copy a->b (2)" (tip) |
154 rebasing 3:47e1a9e6273b "copy a->b (2)" (tip) |
155 saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-backup.hg (glob) |
155 saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg (glob) |
156 |
156 |
157 $ hg log -G -f b |
157 $ hg log -G -f b |
158 @ changeset: 3:76024fb4b05b |
158 @ changeset: 3:76024fb4b05b |
159 : tag: tip |
159 : tag: tip |
160 : user: test |
160 : user: test |