topic - merge - rebase

Friedrich Hagedorn friedrich_h at gmx.de
Sat Jul 4 07:58:47 UTC 2020


Hello,

I hope this is the right place to report a topic issue.

Right know, I evaluate hg topics vs. git branches. In short,
I just want to rebase a local topic branch with an upstream merge
to the default branch:

    default  o---o----o----o
              \        \
      topic    t1--t2---M----t3

After doing

    hg up topic
    hg rebase

I expect

    default  o----o----o----o----t1'----t2'----t3'

but I get

    default  o---o----o----o
              \             \
      topic    t1--t2--------M'----t3'

So only the merge M together with t3' is rebased but not t1 and t2.

I can fix it with

    hg rebase -s t1 -d default

but I just want for the user to type

    hg rebase

I think you know what I mean :-)


Regards

  Friedrich



More information about the Evolve-testers mailing list