Show More
@@ -573,8 +573,8 b' class rebaseruntime(object):' | |||
|
573 | 573 | ui.debug('rebased as %s\n' % short(newnode)) |
|
574 | 574 | else: |
|
575 | 575 | if not self.collapsef: |
|
576 |
ui.warn(_('note: |
|
|
577 |
' |
|
|
576 | ui.warn(_('note: not rebasing %s, its destination already ' | |
|
577 | 'has all its changes\n') % desc) | |
|
578 | 578 | self.skipped.add(rev) |
|
579 | 579 | self.state[rev] = p1 |
|
580 | 580 | ui.debug('next revision set to %d\n' % p1) |
@@ -206,7 +206,7 b' Rebase and abort without generating new ' | |||
|
206 | 206 | |
|
207 | 207 | $ hg rebase -b 4 -d 2 |
|
208 | 208 | rebasing 3:a6484957d6b9 "B bis" |
|
209 |
note: |
|
|
209 | note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes | |
|
210 | 210 | rebasing 4:145842775fec "C1" (tip) |
|
211 | 211 | merging c |
|
212 | 212 | warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
@@ -493,7 +493,7 b' commit will cause merge conflict on reba' | |||
|
493 | 493 | $ hg commit -m 'add content draft' -q |
|
494 | 494 | |
|
495 | 495 | $ hg rebase -d 'public()' --tool :merge -q |
|
496 |
note: |
|
|
496 | note: not rebasing 3:0682fd3dabf5 "disappear draft", its destination already has all its changes | |
|
497 | 497 | warning: conflicts while merging root! (edit, then use 'hg resolve --mark') |
|
498 | 498 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
499 | 499 | [1] |
@@ -231,7 +231,7 b' Rebase entire branch3 (7-8) onto branch2' | |||
|
231 | 231 | |
|
232 | 232 | $ hg rebase -s 7 -d 6 |
|
233 | 233 | rebasing 7:653b9feb4616 "branch3" |
|
234 |
note: |
|
|
234 | note: not rebasing 7:653b9feb4616 "branch3", its destination already has all its changes | |
|
235 | 235 | rebasing 8:4666b71e8e32 "F" (tip) |
|
236 | 236 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg |
|
237 | 237 |
@@ -500,7 +500,7 b' Interactions between collapse and keepbr' | |||
|
500 | 500 | |
|
501 | 501 | $ hg rebase -s 5 -d 4 |
|
502 | 502 | rebasing 5:fbfb97b1089a "E" (tip) |
|
503 |
note: |
|
|
503 | note: not rebasing 5:fbfb97b1089a "E" (tip), its destination already has all its changes | |
|
504 | 504 | saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg |
|
505 | 505 | $ hg tglog |
|
506 | 506 | @ 4: f338eb3c2c7c 'E' |
@@ -304,7 +304,7 b' Ensure --continue restores a correct sta' | |||
|
304 | 304 | continue: hg rebase --continue |
|
305 | 305 | $ hg rebase -c |
|
306 | 306 | rebasing 3:17b4880d2402 "B2" (tip) |
|
307 |
note: |
|
|
307 | note: not rebasing 3:17b4880d2402 "B2" (tip), its destination already has all its changes | |
|
308 | 308 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg |
|
309 | 309 | $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
|
310 | 310 | o 2:draft 'C' |
@@ -51,9 +51,9 b' With --keep, bookmark should move' | |||
|
51 | 51 | |
|
52 | 52 | $ hg rebase -r 3+4 -d E --keep |
|
53 | 53 | rebasing 3:e7b3f00ed42e "D" (BOOK-D) |
|
54 |
note: |
|
|
54 | note: not rebasing 3:e7b3f00ed42e "D" (BOOK-D), its destination already has all its changes | |
|
55 | 55 | rebasing 4:69a34c08022a "E" (BOOK-E) |
|
56 |
note: |
|
|
56 | note: not rebasing 4:69a34c08022a "E" (BOOK-E), its destination already has all its changes | |
|
57 | 57 | $ hg log -G -T '{rev} {desc} {bookmarks}' |
|
58 | 58 | o 7 E BOOK-D BOOK-E |
|
59 | 59 | | |
@@ -84,9 +84,9 b' still introduced by an ancestor of chang' | |||
|
84 | 84 | $ hg rebase -s 2 -d E |
|
85 | 85 | rebasing 2:dc0947a82db8 "C" (BOOK-C C) |
|
86 | 86 | rebasing 3:e7b3f00ed42e "D" (BOOK-D) |
|
87 |
note: |
|
|
87 | note: not rebasing 3:e7b3f00ed42e "D" (BOOK-D), its destination already has all its changes | |
|
88 | 88 | rebasing 4:69a34c08022a "E" (BOOK-E) |
|
89 |
note: |
|
|
89 | note: not rebasing 4:69a34c08022a "E" (BOOK-E), its destination already has all its changes | |
|
90 | 90 | rebasing 5:6b2aeab91270 "F" (BOOK-F F) |
|
91 | 91 | saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg |
|
92 | 92 | $ hg log -G -T '{rev} {desc} {bookmarks}' |
@@ -131,11 +131,11 b' Merge and its ancestors all become empty' | |||
|
131 | 131 | |
|
132 | 132 | $ hg rebase -r '(A::)-(B::)-A' -d H |
|
133 | 133 | rebasing 2:dc0947a82db8 "C" (BOOK-C) |
|
134 |
note: |
|
|
134 | note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes | |
|
135 | 135 | rebasing 3:b18e25de2cf5 "D" (BOOK-D) |
|
136 |
note: |
|
|
136 | note: not rebasing 3:b18e25de2cf5 "D" (BOOK-D), its destination already has all its changes | |
|
137 | 137 | rebasing 4:86a1f6686812 "E" (BOOK-E E) |
|
138 |
note: |
|
|
138 | note: not rebasing 4:86a1f6686812 "E" (BOOK-E E), its destination already has all its changes | |
|
139 | 139 | saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg |
|
140 | 140 | |
|
141 | 141 | $ hg log -G -T '{rev} {desc} {bookmarks}' |
@@ -180,11 +180,11 b' Part of ancestors of a merge become empt' | |||
|
180 | 180 | |
|
181 | 181 | $ hg rebase -r '(A::)-(B::)-A' -d H |
|
182 | 182 | rebasing 2:dc0947a82db8 "C" (BOOK-C) |
|
183 |
note: |
|
|
183 | note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes | |
|
184 | 184 | rebasing 3:b18e25de2cf5 "D" (BOOK-D D) |
|
185 | 185 | rebasing 4:03ca77807e91 "E" (BOOK-E E) |
|
186 | 186 | rebasing 5:ad6717a6a58e "F" (BOOK-F) |
|
187 |
note: |
|
|
187 | note: not rebasing 5:ad6717a6a58e "F" (BOOK-F), its destination already has all its changes | |
|
188 | 188 | rebasing 6:c58e8bdac1f4 "G" (BOOK-G G) |
|
189 | 189 | saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg |
|
190 | 190 |
@@ -454,7 +454,7 b' Make sure merge state is cleaned up afte' | |||
|
454 | 454 | continue: hg rebase --continue |
|
455 | 455 | $ hg rebase --continue |
|
456 | 456 | rebasing 1:fdaca8533b86 "b" |
|
457 |
note: |
|
|
457 | note: not rebasing 1:fdaca8533b86 "b", its destination already has all its changes | |
|
458 | 458 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
|
459 | 459 | $ hg resolve --list |
|
460 | 460 | $ test -d .hg/merge |
@@ -62,7 +62,7 b' already has one local mq patch' | |||
|
62 | 62 | committing changelog |
|
63 | 63 | rebasing 3:148775c71080 "P1" (p1.patch qtip) |
|
64 | 64 | resolving manifests |
|
65 |
note: |
|
|
65 | note: not rebasing 3:148775c71080 "P1" (p1.patch qtip), its destination already has all its changes | |
|
66 | 66 | rebase merging completed |
|
67 | 67 | updating mq patch p0.patch to 5:9ecc820b1737 |
|
68 | 68 | $TESTTMP/a/.hg/patches/p0.patch |
@@ -143,10 +143,10 b' already has one local mq patch' | |||
|
143 | 143 | |
|
144 | 144 | $ HGMERGE=internal:fail hg rebase |
|
145 | 145 | rebasing 1:b4bffa6e4776 "r1" (qbase r1) |
|
146 |
note: |
|
|
146 | note: not rebasing 1:b4bffa6e4776 "r1" (qbase r1), its destination already has all its changes | |
|
147 | 147 | rebasing 2:c0fd129beb01 "r2" (r2) |
|
148 | 148 | rebasing 3:6ff5b8feed8e "r3" (r3) |
|
149 |
note: |
|
|
149 | note: not rebasing 3:6ff5b8feed8e "r3" (r3), its destination already has all its changes | |
|
150 | 150 | rebasing 4:094320fec554 "r4" (r4) |
|
151 | 151 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
152 | 152 | [1] |
@@ -160,10 +160,10 b' already has one local mq patch' | |||
|
160 | 160 | already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a |
|
161 | 161 | already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a |
|
162 | 162 | rebasing 4:094320fec554 "r4" (r4) |
|
163 |
note: |
|
|
163 | note: not rebasing 4:094320fec554 "r4" (r4), its destination already has all its changes | |
|
164 | 164 | rebasing 5:681a378595ba "r5" (r5) |
|
165 | 165 | rebasing 6:512a1f24768b "r6" (qtip r6) |
|
166 |
note: |
|
|
166 | note: not rebasing 6:512a1f24768b "r6" (qtip r6), its destination already has all its changes | |
|
167 | 167 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg |
|
168 | 168 | |
|
169 | 169 | $ hg tglog |
@@ -337,7 +337,7 b' removed from the series):' | |||
|
337 | 337 | foo |
|
338 | 338 | $ [ -f .hg/patches/empty-important ] |
|
339 | 339 | $ hg -q rebase -d 2 |
|
340 |
note: |
|
|
340 | note: not rebasing 1:0aaf4c3af7eb "important commit message" (empty-important qbase), its destination already has all its changes | |
|
341 | 341 | $ hg qseries |
|
342 | 342 | guarded |
|
343 | 343 | bar |
@@ -157,7 +157,7 b' Branch name containing a dash (issue3181' | |||
|
157 | 157 | |
|
158 | 158 | $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches |
|
159 | 159 | rebasing 5:bc8139ee757c "dev-one named branch" |
|
160 |
note: |
|
|
160 | note: not rebasing 5:bc8139ee757c "dev-one named branch", its destination already has all its changes | |
|
161 | 161 | rebasing 6:42aa3cf0fa7a "F" |
|
162 | 162 | rebasing 7:1a1e6f72ec38 "G" |
|
163 | 163 | rebasing 8:904590360559 "H" |
@@ -329,7 +329,7 b" rebase 'b2' to another lower branch head" | |||
|
329 | 329 | $ hg up -qr 2 |
|
330 | 330 | $ hg rebase |
|
331 | 331 | rebasing 2:792845bb77ee "b2" |
|
332 |
note: |
|
|
332 | note: not rebasing 2:792845bb77ee "b2", its destination already has all its changes | |
|
333 | 333 | saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg |
|
334 | 334 | $ hg tglog |
|
335 | 335 | o 2: c062e3ecd6c6 'c1' c |
@@ -395,7 +395,7 b" rebase 'c1' to the branch head 'c2' that" | |||
|
395 | 395 | $ hg rebase -r 3:: -d . |
|
396 | 396 | rebasing 3:76abc1c6f8c7 "b1" |
|
397 | 397 | rebasing 4:8427af5d86f2 "c2 closed" (tip) |
|
398 |
note: |
|
|
398 | note: not rebasing 4:8427af5d86f2 "c2 closed" (tip), its destination already has all its changes | |
|
399 | 399 | saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg |
|
400 | 400 | $ hg tglog |
|
401 | 401 | o 3: 117b0ed08075 'b1' x |
@@ -130,7 +130,7 b' Full rebase all the way back from branch' | |||
|
130 | 130 | > c |
|
131 | 131 | > EOF |
|
132 | 132 | rebasing 1:1d1a643d390e "dev: create branch" |
|
133 |
note: |
|
|
133 | note: not rebasing 1:1d1a643d390e "dev: create branch", its destination already has all its changes | |
|
134 | 134 | rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
|
135 | 135 | rebasing 4:4b019212aaf6 "dev: merge default" |
|
136 | 136 | file 'f-default' was deleted in local [dest] but was modified in other [source]. |
@@ -129,10 +129,10 b' set.' | |||
|
129 | 129 | grafting 3:32af7686d403 "D" |
|
130 | 130 | $ hg rebase -s 42ccdea3bb16 -d . |
|
131 | 131 | rebasing 1:42ccdea3bb16 "B" |
|
132 |
note: |
|
|
132 | note: not rebasing 1:42ccdea3bb16 "B", its destination already has all its changes | |
|
133 | 133 | rebasing 2:5fddd98957c8 "C" |
|
134 | 134 | rebasing 3:32af7686d403 "D" |
|
135 |
note: |
|
|
135 | note: not rebasing 3:32af7686d403 "D", its destination already has all its changes | |
|
136 | 136 | $ hg log -G |
|
137 | 137 | o 10:5ae4c968c6ac C |
|
138 | 138 | | |
@@ -1456,7 +1456,7 b' Rebase merge where successor of one pare' | |||
|
1456 | 1456 | rebasing 2:b18e25de2cf5 "D" (D) |
|
1457 | 1457 | note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B) |
|
1458 | 1458 | rebasing 5:66f1a38021c9 "F" (F tip) |
|
1459 |
note: |
|
|
1459 | note: not rebasing 5:66f1a38021c9 "F" (F tip), its destination already has all its changes | |
|
1460 | 1460 | $ hg log -G |
|
1461 | 1461 | o 6:8f47515dda15 D |
|
1462 | 1462 | | |
@@ -1492,7 +1492,7 b' Rebase merge where successor of other pa' | |||
|
1492 | 1492 | note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B) |
|
1493 | 1493 | rebasing 3:7fb047a69f22 "E" (E) |
|
1494 | 1494 | rebasing 5:66f1a38021c9 "F" (F tip) |
|
1495 |
note: |
|
|
1495 | note: not rebasing 5:66f1a38021c9 "F" (F tip), its destination already has all its changes | |
|
1496 | 1496 | |
|
1497 | 1497 | $ hg log -G |
|
1498 | 1498 | o 6:533690786a86 E |
@@ -440,7 +440,7 b' Test --tool parameter:' | |||
|
440 | 440 | |
|
441 | 441 | $ hg rebase -s 2 -d 1 --tool internal:local |
|
442 | 442 | rebasing 2:e4e3f3546619 "c2b" (tip) |
|
443 |
note: |
|
|
443 | note: not rebasing 2:e4e3f3546619 "c2b" (tip), its destination already has all its changes | |
|
444 | 444 | saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg |
|
445 | 445 | |
|
446 | 446 | $ hg cat c2 |
@@ -493,7 +493,7 b' Test --tool parameter:' | |||
|
493 | 493 | [255] |
|
494 | 494 | $ hg rebase -c --tool internal:fail |
|
495 | 495 | rebasing 2:e4e3f3546619 "c2b" (tip) |
|
496 |
note: |
|
|
496 | note: not rebasing 2:e4e3f3546619 "c2b" (tip), its destination already has all its changes | |
|
497 | 497 | saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg |
|
498 | 498 | |
|
499 | 499 | $ hg rebase -i |
@@ -138,7 +138,7 b' if they have the same contents)' | |||
|
138 | 138 | $ hg rebase -s 4 -d 7 |
|
139 | 139 | rebasing 4:9520eea781bc "E" |
|
140 | 140 | rebasing 6:eea13746799a "G" |
|
141 |
note: |
|
|
141 | note: not rebasing 6:eea13746799a "G", its destination already has all its changes | |
|
142 | 142 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg |
|
143 | 143 | $ f E.orig |
|
144 | 144 | E.orig: file not found |
@@ -169,7 +169,7 b' F onto E - rebase of a branching point (' | |||
|
169 | 169 | $ hg rebase -s 5 -d 4 |
|
170 | 170 | rebasing 5:24b6387c8c8c "F" |
|
171 | 171 | rebasing 6:eea13746799a "G" |
|
172 |
note: |
|
|
172 | note: not rebasing 6:eea13746799a "G", its destination already has all its changes | |
|
173 | 173 | rebasing 7:02de42196ebe "H" (tip) |
|
174 | 174 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg |
|
175 | 175 |
@@ -87,7 +87,7 b'' | |||
|
87 | 87 | $ hg pull -q |
|
88 | 88 | $ hg rebase -d tip |
|
89 | 89 | rebasing 1:4549721d828f "xx2" |
|
90 |
note: |
|
|
90 | note: not rebasing 1:4549721d828f "xx2", its destination already has all its changes | |
|
91 | 91 | rebasing 2:5ef6d97e851c "xxy" |
|
92 | 92 | saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-rebase.hg (glob) |
|
93 | 93 | $ hg log -f x --template '{node|short}\n' |
General Comments 0
You need to be logged in to leave comments.
Login now