Handling complicated rebase scenarios

[Kirill Müller]

Sometimes I have the following use case:

---A----A'
    \
     B----C

I need to rebase both B and C against A'. This occurs after rebasing B against A' (--> B') and C against B':

---A----A'
         \
          B'----B----C'

However, the correct schema would be this:

---A----A'
         \
          B'----C'

I have proposed ignoring the (pointless) commits of B in https://bugs.launchpad.net/bzr-rewrite/+bug/886542 . However, this could be handled better if B' "knew" somehow which commits of C are already integrated. Would it be an option to add the corresponding original commit of B as parent of each commit of B'? What would be the implications of this, especially considering rebase -i/histedit where the order of commits can change?

[Jelmer Vernooij (jelmer)]

rebase already sets revision properties that indicate what revision a new revision was based on.

You could potentially use this information.

[Jelmer Vernooij (jelmer)]

I'm not really sure what this bug report is asking for - it seems to be a dupe of bug 886542 mostly.