merging / integrating a subrepo into its parent

Benoit Fouletier benblo at gmail.com
Thu Jul 5 09:46:59 UTC 2018


I have the following structure:
* main
  * sub

sub is currently stored in a subrepo: now I would like to have it as a
regular subfolder of main, with its history stored in main.

I know I could use hg pull --force to add it as a parallel branch, then
merge the heads, and the end result would look like this:
    o-main1-main2-main2------------------o
                                        /
                        o-sub1-sub2-sub3

... but it feels like a shame to lose the main <-> sub relationship tracked
by .hgsubstate, so basically I would like to rewrite it to:
    o-main1-sub1-main2-sub2-main2-sub3-o
--> is there a way to achieve that? perhaps using hg convert?

I am fine with rewriting history, changing hashes and recloning everything.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial/attachments/20180705/de442073/attachment.html>


More information about the Mercurial mailing list