Show More
@@ -350,6 +350,8 b' class rebaseruntime(object):' | |||||
350 |
|
350 | |||
351 | def _handleskippingobsolete(self): |
|
351 | def _handleskippingobsolete(self): | |
352 | """Compute structures necessary for skipping obsolete revisions""" |
|
352 | """Compute structures necessary for skipping obsolete revisions""" | |
|
353 | if self.keepf: | |||
|
354 | return | |||
353 | if not self.ui.configbool(b'experimental', b'rebaseskipobsolete'): |
|
355 | if not self.ui.configbool(b'experimental', b'rebaseskipobsolete'): | |
354 | return |
|
356 | return | |
355 | obsoleteset = {r for r in self.state if self.repo[r].obsolete()} |
|
357 | obsoleteset = {r for r in self.state if self.repo[r].obsolete()} |
@@ -317,3 +317,25 b' Create the changes that we will rebase' | |||||
317 | note: not rebasing 20:8b31da3c4919 "dummy change", already in destination as 18:601db7a18f51 "dummy change successor" |
|
317 | note: not rebasing 20:8b31da3c4919 "dummy change", already in destination as 18:601db7a18f51 "dummy change successor" | |
318 | rebasing 21:7bdc8a87673d tip "dummy change" |
|
318 | rebasing 21:7bdc8a87673d tip "dummy change" | |
319 | $ cd .. |
|
319 | $ cd .. | |
|
320 | ||||
|
321 | Can rebase pruned and rewritten commits with --keep | |||
|
322 | ||||
|
323 | $ hg init keep | |||
|
324 | $ cd keep | |||
|
325 | $ hg debugdrawdag <<'EOS' | |||
|
326 | > D | |||
|
327 | > | | |||
|
328 | > C | |||
|
329 | > | | |||
|
330 | > F B E # prune: B | |||
|
331 | > \|/ # rebase: C -> E | |||
|
332 | > A | |||
|
333 | > EOS | |||
|
334 | 1 new orphan changesets | |||
|
335 | ||||
|
336 | $ hg rebase -b D -d F --keep | |||
|
337 | rebasing 1:112478962961 B "B" | |||
|
338 | rebasing 4:26805aba1e60 C "C" | |||
|
339 | rebasing 5:f585351a92f8 D tip "D" | |||
|
340 | ||||
|
341 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now