Issue #3322 resolved

Allow rebasing current branch onto destination

Piotr Klecha
created an issue

It would be great if it was possible to choose current revision as the source of the rebase and the selected revision as its destination, e.g. by allowing to switch revisions in the rebase dialog. This would allow to save a few clicks and nanocenturies when rebasing on pulled changesets (in case someone forgot or didn't want to use pull --rebase).

Comments (10)

  1. Piotr Klecha reporter

    After receiving some insightful feedback from my colleagues, I consider selecting two revisions on the graph to be a much more obvious and simple way of choosing source and destination. A "swap" button could be added in case they are accidently selected in the wrong order. To fully achieve the goal, rebase dialog also needs to support the '--base' rebase flag.

    The attached patches implement all the aforementioned features.

    I'm aware that this is not the preferable way to submit patches, but, for some mysterious reason, my emails to thg-dev group are rejected :-(

  2. Yuya Nishihara

    for some mysterious reason, my emails to thg-dev group are rejected

    Maybe you'll need to join thg-dev? Please resend patches. It's hard to comment on attached files.

    I guess swap button won't work if "base" option is specified by RebaseDialog(..., base=x). Preferably, "base" revision should be calculated by the dialog so that it can show the detail on sourcecsinfo.

  3. Piotr Klecha reporter
    • changed status to open

    I'm afraid that patch 14682 alone might do more harm than good, because without 14680 (--base support) it will not rebase the entire branch, which is usually not the desired behavior (it will work fine only if ther is only one commit in the current branch). I will try to fix the other patches and then send them to the mailing list.

  4. Log in to comment