equal
deleted
inserted
replaced
132 > EOF |
132 > EOF |
133 |
133 |
134 |
134 |
135 $ hg rebase --base B -m 'custom message' |
135 $ hg rebase --base B -m 'custom message' |
136 abort: message can only be specified with collapse |
136 abort: message can only be specified with collapse |
137 [255] |
137 [10] |
138 |
138 |
139 $ cat > $TESTTMP/checkeditform.sh <<EOF |
139 $ cat > $TESTTMP/checkeditform.sh <<EOF |
140 > env | grep HGEDITFORM |
140 > env | grep HGEDITFORM |
141 > true |
141 > true |
142 > EOF |
142 > EOF |
178 > A |
178 > A |
179 > EOF |
179 > EOF |
180 |
180 |
181 $ hg rebase -s C --dest H --collapse |
181 $ hg rebase -s C --dest H --collapse |
182 abort: unable to collapse on top of 3, there is more than one external parent: 1, 6 |
182 abort: unable to collapse on top of 3, there is more than one external parent: 1, 6 |
183 [255] |
183 [20] |
184 |
184 |
185 Rebase and collapse - E onto H: |
185 Rebase and collapse - E onto H: |
186 |
186 |
187 $ hg rebase -s E --dest H --collapse # root (E) is not a merge |
187 $ hg rebase -s E --dest H --collapse # root (E) is not a merge |
188 rebasing 5:49cb92066bfd E "E" |
188 rebasing 5:49cb92066bfd E "E" |
384 > EOF |
384 > EOF |
385 |
385 |
386 BROKEN: should be allowed |
386 BROKEN: should be allowed |
387 $ hg rebase --collapse -r 'B+D+F' -d G |
387 $ hg rebase --collapse -r 'B+D+F' -d G |
388 abort: unable to collapse on top of 2, there is more than one external parent: 3, 5 |
388 abort: unable to collapse on top of 2, there is more than one external parent: 3, 5 |
389 [255] |
389 [20] |
390 $ cd .. |
390 $ cd .. |
391 |
391 |
392 |
392 |
393 $ hg init multiple-external-parents-2 |
393 $ hg init multiple-external-parents-2 |
394 $ cd multiple-external-parents-2 |
394 $ cd multiple-external-parents-2 |
402 > A |
402 > A |
403 > EOF |
403 > EOF |
404 |
404 |
405 $ hg rebase --collapse -d H -s 'B+F' |
405 $ hg rebase --collapse -d H -s 'B+F' |
406 abort: unable to collapse on top of 5, there is more than one external parent: 1, 3 |
406 abort: unable to collapse on top of 5, there is more than one external parent: 1, 3 |
407 [255] |
407 [20] |
408 $ cd .. |
408 $ cd .. |
409 |
409 |
410 With internal merge: |
410 With internal merge: |
411 |
411 |
412 $ hg init internal-merge |
412 $ hg init internal-merge |
482 |/ |
482 |/ |
483 o 0: 1994f17a630e 'A' |
483 o 0: 1994f17a630e 'A' |
484 |
484 |
485 $ hg rebase --keepbranches --collapse -s 1 -d 3 |
485 $ hg rebase --keepbranches --collapse -s 1 -d 3 |
486 abort: cannot collapse multiple named branches |
486 abort: cannot collapse multiple named branches |
487 [255] |
487 [10] |
488 |
488 |
489 $ cd .. |
489 $ cd .. |
490 |
490 |
491 Rebase, collapse and copies |
491 Rebase, collapse and copies |
492 |
492 |