equal
deleted
inserted
replaced
163 | o 1: 'branch1' branch1 |
163 | o 1: 'branch1' branch1 |
164 |/ |
164 |/ |
165 o 0: 'A' |
165 o 0: 'A' |
166 |
166 |
167 $ hg rebase -s 8 -d 6 |
167 $ hg rebase -s 8 -d 6 |
168 rebasing 8:4666b71e8e32 "F" (tip) |
168 rebasing 8:4666b71e8e32 tip "F" |
169 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg |
169 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg |
170 |
170 |
171 $ hg branches |
171 $ hg branches |
172 branch2 8:6b4bdc1b5ac0 |
172 branch2 8:6b4bdc1b5ac0 |
173 branch3 7:653b9feb4616 |
173 branch3 7:653b9feb4616 |
230 o 0: 'A' |
230 o 0: 'A' |
231 |
231 |
232 $ hg rebase -s 7 -d 6 |
232 $ hg rebase -s 7 -d 6 |
233 rebasing 7:653b9feb4616 "branch3" |
233 rebasing 7:653b9feb4616 "branch3" |
234 note: not rebasing 7:653b9feb4616 "branch3", its destination already has all its changes |
234 note: not rebasing 7:653b9feb4616 "branch3", its destination already has all its changes |
235 rebasing 8:4666b71e8e32 "F" (tip) |
235 rebasing 8:4666b71e8e32 tip "F" |
236 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg |
236 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg |
237 |
237 |
238 $ hg branches |
238 $ hg branches |
239 branch2 7:6b4bdc1b5ac0 |
239 branch2 7:6b4bdc1b5ac0 |
240 branch1 2:0a03079c47fd (inactive) |
240 branch1 2:0a03079c47fd (inactive) |
476 > true |
476 > true |
477 > EOF |
477 > EOF |
478 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e |
478 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e |
479 rebasing 5:361a99976cc9 "F" |
479 rebasing 5:361a99976cc9 "F" |
480 HGEDITFORM=rebase.merge |
480 HGEDITFORM=rebase.merge |
481 rebasing 8:326cfedc031c "I" (tip) |
481 rebasing 8:326cfedc031c tip "I" |
482 HGEDITFORM=rebase.normal |
482 HGEDITFORM=rebase.normal |
483 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg |
483 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg |