equal
deleted
inserted
replaced
56 > echo "==== before editing" |
56 > echo "==== before editing" |
57 > cat \$1 |
57 > cat \$1 |
58 > echo "====" |
58 > echo "====" |
59 > echo "edited manually" >> \$1 |
59 > echo "edited manually" >> \$1 |
60 > EOF |
60 > EOF |
61 $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e |
61 $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --dest 7 |
62 rebasing 1:42ccdea3bb16 "B" |
62 rebasing 1:42ccdea3bb16 "B" |
63 rebasing 2:5fddd98957c8 "C" |
63 rebasing 2:5fddd98957c8 "C" |
64 rebasing 3:32af7686d403 "D" |
64 rebasing 3:32af7686d403 "D" |
65 ==== before editing |
65 ==== before editing |
66 Collapsed revision |
66 Collapsed revision |
113 |
113 |
114 $ hg clone -q -u . a a2 |
114 $ hg clone -q -u . a a2 |
115 $ cd a2 |
115 $ cd a2 |
116 |
116 |
117 $ hg phase --force --secret 6 |
117 $ hg phase --force --secret 6 |
118 $ hg rebase --source 4 --collapse |
118 $ hg rebase --source 4 --collapse --dest 7 |
119 rebasing 4:9520eea781bc "E" |
119 rebasing 4:9520eea781bc "E" |
120 rebasing 6:eea13746799a "G" |
120 rebasing 6:eea13746799a "G" |
121 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-backup.hg (glob) |
121 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-backup.hg (glob) |
122 |
122 |
123 $ hg tglog |
123 $ hg tglog |
155 |
155 |
156 $ cat > $TESTTMP/checkeditform.sh <<EOF |
156 $ cat > $TESTTMP/checkeditform.sh <<EOF |
157 > env | grep HGEDITFORM |
157 > env | grep HGEDITFORM |
158 > true |
158 > true |
159 > EOF |
159 > EOF |
160 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e |
160 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e --dest 7 |
161 rebasing 4:9520eea781bc "E" |
161 rebasing 4:9520eea781bc "E" |
162 rebasing 6:eea13746799a "G" |
162 rebasing 6:eea13746799a "G" |
163 HGEDITFORM=rebase.collapse |
163 HGEDITFORM=rebase.collapse |
164 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-backup.hg (glob) |
164 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-backup.hg (glob) |
165 |
165 |
259 Rebase and collapse - more than one external (fail): |
259 Rebase and collapse - more than one external (fail): |
260 |
260 |
261 $ hg clone -q -u . b b1 |
261 $ hg clone -q -u . b b1 |
262 $ cd b1 |
262 $ cd b1 |
263 |
263 |
264 $ hg rebase -s 2 --collapse |
264 $ hg rebase -s 2 --dest 7 --collapse |
265 abort: unable to collapse on top of 7, there is more than one external parent: 1, 5 |
265 abort: unable to collapse on top of 7, there is more than one external parent: 1, 5 |
266 [255] |
266 [255] |
267 |
267 |
268 Rebase and collapse - E onto H: |
268 Rebase and collapse - E onto H: |
269 |
269 |
270 $ hg rebase -s 4 --collapse # root (4) is not a merge |
270 $ hg rebase -s 4 --dest 7 --collapse # root (4) is not a merge |
271 rebasing 4:8a5212ebc852 "E" |
271 rebasing 4:8a5212ebc852 "E" |
272 rebasing 5:7f219660301f "F" |
272 rebasing 5:7f219660301f "F" |
273 rebasing 6:c772a8b2dc17 "G" |
273 rebasing 6:c772a8b2dc17 "G" |
274 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-backup.hg (glob) |
274 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-backup.hg (glob) |
275 |
275 |
416 Rebase and collapse - E onto I: |
416 Rebase and collapse - E onto I: |
417 |
417 |
418 $ hg clone -q -u . c c1 |
418 $ hg clone -q -u . c c1 |
419 $ cd c1 |
419 $ cd c1 |
420 |
420 |
421 $ hg rebase -s 4 --collapse # root (4) is not a merge |
421 $ hg rebase -s 4 --dest 8 --collapse # root (4) is not a merge |
422 rebasing 4:8a5212ebc852 "E" |
422 rebasing 4:8a5212ebc852 "E" |
423 rebasing 5:dca5924bb570 "F" |
423 rebasing 5:dca5924bb570 "F" |
424 merging E |
424 merging E |
425 rebasing 6:55a44ad28289 "G" |
425 rebasing 6:55a44ad28289 "G" |
426 rebasing 7:417d3b648079 "H" |
426 rebasing 7:417d3b648079 "H" |
510 Rebase and collapse - B onto F: |
510 Rebase and collapse - B onto F: |
511 |
511 |
512 $ hg clone -q -u . d d1 |
512 $ hg clone -q -u . d d1 |
513 $ cd d1 |
513 $ cd d1 |
514 |
514 |
515 $ hg rebase -s 1 --collapse |
515 $ hg rebase -s 1 --collapse --dest 5 |
516 rebasing 1:27547f69f254 "B" |
516 rebasing 1:27547f69f254 "B" |
517 rebasing 2:f838bfaca5c7 "C" |
517 rebasing 2:f838bfaca5c7 "C" |
518 rebasing 3:7bbcd6078bcc "D" |
518 rebasing 3:7bbcd6078bcc "D" |
519 rebasing 4:0a42590ed746 "E" |
519 rebasing 4:0a42590ed746 "E" |
520 saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-backup.hg (glob) |
520 saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-backup.hg (glob) |