topic - merge - rebase

Faheem Mitha faheem at faheem.info
Sat Jul 4 09:01:34 UTC 2020


Hi Friedrich,

On Sat, 4 Jul 2020, Friedrich Hagedorn wrote:

> 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:

I'm also a topics user. It would be helpful if you could provide a script 
(meaning a list of command line commands to give), which can be used to 
reproduce the issue.

Regards, Faheem Mitha

>    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
>
> _______________________________________________
> Evolve-testers mailing list
> Evolve-testers at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/evolve-testers
>
>



More information about the Evolve-testers mailing list