Show More
@@ -631,6 +631,12 b' class rebaseruntime(object):' | |||
|
631 | 631 | editor = cmdutil.getcommiteditor( |
|
632 | 632 | editform=editform, **pycompat.strkwargs(opts) |
|
633 | 633 | ) |
|
634 | # We need to set parents again here just in case we're continuing | |
|
635 | # a rebase started with an old hg version (before 9c9cfecd4600), | |
|
636 | # because those old versions would have left us with two dirstate | |
|
637 | # parents, and we don't want to create a merge commit here (unless | |
|
638 | # we're rebasing a merge commit). | |
|
639 | self.wctx.setparents(repo[p1].node(), repo[p2].node()) | |
|
634 | 640 | newnode = self._concludenode(rev, p1, editor) |
|
635 | 641 | else: |
|
636 | 642 | # Skip commit if we are collapsing |
@@ -327,21 +327,16 b' two dirstate parents. We should not get ' | |||
|
327 | 327 | $ hg rebase --continue |
|
328 | 328 | already rebased 1:27547f69f254 "B" as 45396c49d53b |
|
329 | 329 | rebasing 2:965c486023db "C" |
|
330 | warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db | |
|
331 | BROKEN: we should not have a merge commit here | |
|
330 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/27547f69f254-359abdd7-rebase.hg | |
|
332 | 331 | $ hg tglog |
|
333 | o 6: 567335b578a0 'C' | |
|
334 |
| |
|
|
335 |
|
|
|
336 |
| |
|
|
337 |
|
|
|
338 |
| |
|
|
339 |
|
|
|
340 |
| |
|
|
341 | o | 2: 965c486023db 'C' | |
|
342 | | | | |
|
343 | o | 1: 27547f69f254 'B' | |
|
344 | |/ | |
|
332 | o 4: d2d25e26288e 'C' | |
|
333 | | | |
|
334 | o 3: 45396c49d53b 'B' | |
|
335 | | | |
|
336 | @ 2: ae36e8e3dfd7 'E' | |
|
337 | | | |
|
338 | o 1: 46b37eabc604 'D' | |
|
339 | | | |
|
345 | 340 | o 0: 4a2df7238c3b 'A' |
|
346 | 341 | |
|
347 | 342 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now