equal
deleted
inserted
replaced
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 |
62 rebasing 1:42ccdea3bb16 "B" |
62 rebasing 1:42ccdea3bb16 "B" |
63 note: rebase of 1:42ccdea3bb16 created no changes to commit |
|
64 rebasing 2:5fddd98957c8 "C" |
63 rebasing 2:5fddd98957c8 "C" |
65 note: rebase of 2:5fddd98957c8 created no changes to commit |
|
66 rebasing 3:32af7686d403 "D" |
64 rebasing 3:32af7686d403 "D" |
67 note: rebase of 3:32af7686d403 created no changes to commit |
|
68 ==== before editing |
65 ==== before editing |
69 Collapsed revision |
66 Collapsed revision |
70 * B |
67 * B |
71 * C |
68 * C |
72 * D |
69 * D |
118 $ cd a2 |
115 $ cd a2 |
119 |
116 |
120 $ hg phase --force --secret 6 |
117 $ hg phase --force --secret 6 |
121 $ hg rebase --source 4 --collapse |
118 $ hg rebase --source 4 --collapse |
122 rebasing 4:9520eea781bc "E" |
119 rebasing 4:9520eea781bc "E" |
123 note: rebase of 4:9520eea781bc created no changes to commit |
|
124 rebasing 6:eea13746799a "G" |
120 rebasing 6:eea13746799a "G" |
125 note: rebase of 6:eea13746799a created no changes to commit |
|
126 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) |
127 |
122 |
128 $ hg tglog |
123 $ hg tglog |
129 o 6: 'Collapsed revision |
124 o 6: 'Collapsed revision |
130 | * E |
125 | * E |
162 > env | grep HGEDITFORM |
157 > env | grep HGEDITFORM |
163 > true |
158 > true |
164 > EOF |
159 > EOF |
165 $ 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 |
166 rebasing 4:9520eea781bc "E" |
161 rebasing 4:9520eea781bc "E" |
167 note: rebase of 4:9520eea781bc created no changes to commit |
|
168 rebasing 6:eea13746799a "G" |
162 rebasing 6:eea13746799a "G" |
169 note: rebase of 6:eea13746799a created no changes to commit |
|
170 HGEDITFORM=rebase.collapse |
163 HGEDITFORM=rebase.collapse |
171 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) |
172 |
165 |
173 $ hg tglog |
166 $ hg tglog |
174 o 6: 'custom message' |
167 o 6: 'custom message' |
274 |
267 |
275 Rebase and collapse - E onto H: |
268 Rebase and collapse - E onto H: |
276 |
269 |
277 $ hg rebase -s 4 --collapse # root (4) is not a merge |
270 $ hg rebase -s 4 --collapse # root (4) is not a merge |
278 rebasing 4:8a5212ebc852 "E" |
271 rebasing 4:8a5212ebc852 "E" |
279 note: rebase of 4:8a5212ebc852 created no changes to commit |
|
280 rebasing 5:7f219660301f "F" |
272 rebasing 5:7f219660301f "F" |
281 note: rebase of 5:7f219660301f created no changes to commit |
|
282 rebasing 6:c772a8b2dc17 "G" |
273 rebasing 6:c772a8b2dc17 "G" |
283 note: rebase of 6:c772a8b2dc17 created no changes to commit |
|
284 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) |
285 |
275 |
286 $ hg tglog |
276 $ hg tglog |
287 o 5: 'Collapsed revision |
277 o 5: 'Collapsed revision |
288 |\ * E |
278 |\ * E |
428 $ hg clone -q -u . c c1 |
418 $ hg clone -q -u . c c1 |
429 $ cd c1 |
419 $ cd c1 |
430 |
420 |
431 $ hg rebase -s 4 --collapse # root (4) is not a merge |
421 $ hg rebase -s 4 --collapse # root (4) is not a merge |
432 rebasing 4:8a5212ebc852 "E" |
422 rebasing 4:8a5212ebc852 "E" |
433 note: rebase of 4:8a5212ebc852 created no changes to commit |
|
434 rebasing 5:dca5924bb570 "F" |
423 rebasing 5:dca5924bb570 "F" |
435 merging E |
424 merging E |
436 note: rebase of 5:dca5924bb570 created no changes to commit |
|
437 rebasing 6:55a44ad28289 "G" |
425 rebasing 6:55a44ad28289 "G" |
438 note: rebase of 6:55a44ad28289 created no changes to commit |
|
439 rebasing 7:417d3b648079 "H" |
426 rebasing 7:417d3b648079 "H" |
440 note: rebase of 7:417d3b648079 created no changes to commit |
|
441 saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-backup.hg (glob) |
427 saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-backup.hg (glob) |
442 |
428 |
443 $ hg tglog |
429 $ hg tglog |
444 o 5: 'Collapsed revision |
430 o 5: 'Collapsed revision |
445 |\ * E |
431 |\ * E |
526 $ hg clone -q -u . d d1 |
512 $ hg clone -q -u . d d1 |
527 $ cd d1 |
513 $ cd d1 |
528 |
514 |
529 $ hg rebase -s 1 --collapse |
515 $ hg rebase -s 1 --collapse |
530 rebasing 1:27547f69f254 "B" |
516 rebasing 1:27547f69f254 "B" |
531 note: rebase of 1:27547f69f254 created no changes to commit |
|
532 rebasing 2:f838bfaca5c7 "C" |
517 rebasing 2:f838bfaca5c7 "C" |
533 note: rebase of 2:f838bfaca5c7 created no changes to commit |
|
534 rebasing 3:7bbcd6078bcc "D" |
518 rebasing 3:7bbcd6078bcc "D" |
535 note: rebase of 3:7bbcd6078bcc created no changes to commit |
|
536 rebasing 4:0a42590ed746 "E" |
519 rebasing 4:0a42590ed746 "E" |
537 note: rebase of 4:0a42590ed746 created no changes to commit |
|
538 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) |
539 |
521 |
540 $ hg tglog |
522 $ hg tglog |
541 o 2: 'Collapsed revision |
523 o 2: 'Collapsed revision |
542 | * B |
524 | * B |
673 $ hg rebase --collapse -d 1 |
655 $ hg rebase --collapse -d 1 |
674 rebasing 2:6e7340ee38c0 "move1" |
656 rebasing 2:6e7340ee38c0 "move1" |
675 merging a and d to d |
657 merging a and d to d |
676 merging b and e to e |
658 merging b and e to e |
677 merging c and f to f |
659 merging c and f to f |
678 note: rebase of 2:6e7340ee38c0 created no changes to commit |
|
679 rebasing 3:338e84e2e558 "move2" (tip) |
660 rebasing 3:338e84e2e558 "move2" (tip) |
680 merging f and c to c |
661 merging f and c to c |
681 merging e and g to g |
662 merging e and g to g |
682 note: rebase of 3:338e84e2e558 created no changes to commit |
|
683 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-backup.hg (glob) |
663 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-backup.hg (glob) |
684 $ hg st |
664 $ hg st |
685 $ hg st --copies --change tip |
665 $ hg st --copies --change tip |
686 A d |
666 A d |
687 a |
667 a |
718 |
698 |
719 Test collapsing in place |
699 Test collapsing in place |
720 |
700 |
721 $ hg rebase --collapse -b . -d 0 |
701 $ hg rebase --collapse -b . -d 0 |
722 rebasing 1:1352765a01d4 "change" |
702 rebasing 1:1352765a01d4 "change" |
723 note: rebase of 1:1352765a01d4 created no changes to commit |
|
724 rebasing 2:64b456429f67 "Collapsed revision" (tip) |
703 rebasing 2:64b456429f67 "Collapsed revision" (tip) |
725 note: rebase of 2:64b456429f67 created no changes to commit |
|
726 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-backup.hg (glob) |
704 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-backup.hg (glob) |
727 $ hg st --change tip --copies |
705 $ hg st --change tip --copies |
728 M a |
706 M a |
729 M c |
707 M c |
730 A d |
708 A d |
812 $ hg commit -Am b |
790 $ hg commit -Am b |
813 adding b |
791 adding b |
814 $ hg book foo |
792 $ hg book foo |
815 $ hg rebase -d 0 -r "1::2" --collapse -m collapsed |
793 $ hg rebase -d 0 -r "1::2" --collapse -m collapsed |
816 rebasing 1:6d8d9f24eec3 "a" |
794 rebasing 1:6d8d9f24eec3 "a" |
817 note: rebase of 1:6d8d9f24eec3 created no changes to commit |
|
818 rebasing 2:1cc73eca5ecc "b" (tip foo) |
795 rebasing 2:1cc73eca5ecc "b" (tip foo) |
819 note: rebase of 2:1cc73eca5ecc created no changes to commit |
|
820 saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-backup.hg (glob) |
796 saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-backup.hg (glob) |
821 $ hg log -G --template "{rev}: '{desc}' {bookmarks}" |
797 $ hg log -G --template "{rev}: '{desc}' {bookmarks}" |
822 @ 1: 'collapsed' foo |
798 @ 1: 'collapsed' foo |
823 | |
799 | |
824 o 0: 'base' |
800 o 0: 'base' |