D7730: rebase: make sure pruning does not confuse rebase (issue6180)

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> rebase.py:597
>              self.state[rev] = dest
> +            # since we are done, make sure wdir has one parent (issue6180)
> +            if len(repo[None].parents()) == 2:

I think it's incorrect that rebase sets two parents while the merge is being resolved, but that's out of scope for this patch.

> rebase.py:598
> +            # since we are done, make sure wdir has one parent (issue6180)
> +            if len(repo[None].parents()) == 2:
> +                p1 = repo[None].p1().node()

Should this be `self.wctx.parents()` to work with in-memory rebase?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7730/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7730

To: khanchi97, martinvonz, #hg-reviewers
Cc: mercurial-devel