D527: rebase: move working parent and bookmark for obsoleted revs (BC)

quark (Jun Wu) phabricator at mercurial-scm.org
Tue Aug 29 19:55:50 EDT 2017


quark added inline comments.

INLINE COMMENTS

> martinvonz wrote in rebase.py:423-424
> Why do we still need the adjustment in clearrebased() when we do it here? What kinds of nodes will be adjusted here and what kinds will be left for clearrebased?

Good question. The reason is this is "skipped" has two cases - 1. obsolete skip 2. "create no commit" skip (line 477), which uses a slightly different p1.

I think we might be able to remove the adjustment in clearrebased. I'll send a follow-up once I figure out the minor differences.

REPOSITORY
  rHG Mercurial

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

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


More information about the Mercurial-devel mailing list