Show More
@@ -167,7 +167,7 b' rebase --continue with bookmarks present' | |||||
167 | created new head |
|
167 | created new head | |
168 | $ hg up 3 |
|
168 | $ hg up 3 | |
169 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
169 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
170 | $ hg rebase |
|
170 | $ hg rebase --dest 4 | |
171 | rebasing 3:3d5fa227f4b5 "C" (Y Z) |
|
171 | rebasing 3:3d5fa227f4b5 "C" (Y Z) | |
172 | merging c |
|
172 | merging c | |
173 | warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
|
173 | warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
@@ -58,7 +58,7 b' Rebasing B onto H and collapsing changes' | |||||
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" | |
@@ -115,7 +115,7 b' Rebasing E onto H:' | |||||
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) | |
@@ -157,7 +157,7 b' Rebasing G onto H with custom message:' | |||||
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 | |
@@ -261,13 +261,13 b' Rebase and collapse - more than one exte' | |||||
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" | |
@@ -418,7 +418,7 b' Rebase and collapse - E onto I:' | |||||
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 | |
@@ -512,7 +512,7 b' Rebase and collapse - B onto F:' | |||||
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" |
@@ -82,33 +82,33 b' These fail:' | |||||
82 | abort: cannot specify both a revision and a base |
|
82 | abort: cannot specify both a revision and a base | |
83 | [255] |
|
83 | [255] | |
84 |
|
84 | |||
85 | $ hg rebase --rev '1 & !1' |
|
85 | $ hg rebase --rev '1 & !1' --dest 8 | |
86 | empty "rev" revision set - nothing to rebase |
|
86 | empty "rev" revision set - nothing to rebase | |
87 | [1] |
|
87 | [1] | |
88 |
|
88 | |||
89 | $ hg rebase --source '1 & !1' |
|
89 | $ hg rebase --source '1 & !1' --dest 8 | |
90 | empty "source" revision set - nothing to rebase |
|
90 | empty "source" revision set - nothing to rebase | |
91 | [1] |
|
91 | [1] | |
92 |
|
92 | |||
93 | $ hg rebase --base '1 & !1' |
|
93 | $ hg rebase --base '1 & !1' --dest 8 | |
94 | empty "base" revision set - can't compute rebase set |
|
94 | empty "base" revision set - can't compute rebase set | |
95 | [1] |
|
95 | [1] | |
96 |
|
96 | |||
97 | $ hg rebase |
|
97 | $ hg rebase --dest 8 | |
98 | nothing to rebase - working directory parent is also destination |
|
98 | nothing to rebase - working directory parent is also destination | |
99 | [1] |
|
99 | [1] | |
100 |
|
100 | |||
101 | $ hg rebase -b. |
|
101 | $ hg rebase -b . --dest 8 | |
102 | nothing to rebase - e7ec4e813ba6 is both "base" and destination |
|
102 | nothing to rebase - e7ec4e813ba6 is both "base" and destination | |
103 | [1] |
|
103 | [1] | |
104 |
|
104 | |||
105 | $ hg up -q 7 |
|
105 | $ hg up -q 7 | |
106 |
|
106 | |||
107 | $ hg rebase --traceback |
|
107 | $ hg rebase --dest 8 --traceback | |
108 | nothing to rebase - working directory parent is already an ancestor of destination e7ec4e813ba6 |
|
108 | nothing to rebase - working directory parent is already an ancestor of destination e7ec4e813ba6 | |
109 | [1] |
|
109 | [1] | |
110 |
|
110 | |||
111 | $ hg rebase -b. |
|
111 | $ hg rebase --dest 8 -b. | |
112 | nothing to rebase - "base" 02de42196ebe is already an ancestor of destination e7ec4e813ba6 |
|
112 | nothing to rebase - "base" 02de42196ebe is already an ancestor of destination e7ec4e813ba6 | |
113 | [1] |
|
113 | [1] | |
114 |
|
114 | |||
@@ -402,7 +402,7 b' Rebasing both a single revision and a me' | |||||
402 |
|
402 | |||
403 | $ hg clone -q -u . a aX |
|
403 | $ hg clone -q -u . a aX | |
404 | $ cd aX |
|
404 | $ cd aX | |
405 | $ hg rebase -r 3 -r 6 |
|
405 | $ hg rebase -r 3 -r 6 --dest 8 | |
406 | rebasing 3:32af7686d403 "D" |
|
406 | rebasing 3:32af7686d403 "D" | |
407 | rebasing 6:eea13746799a "G" |
|
407 | rebasing 6:eea13746799a "G" | |
408 | saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-backup.hg (glob) |
|
408 | saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-backup.hg (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now