Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>The ideal solution consiste to keep local Mercurial repo, and work only with this local repo to the existing bitbucket Mercurial remote repo.</p> <p>With a plugin <a href="http://hg-git.github.com/" rel="nofollow noreferrer">like <strong>Hg-Git</strong></a>, you can at least push to and pull from a Git server repository from Mercurial, allowing you to pull from the GitHub repo to your local Mercurial repo. </p> <p><img src="https://i.stack.imgur.com/BOsBY.png" alt="alt text"></p> <p>From that local (Mercurial) repo, you can then work as usual with the bitbucket remote repo.</p> <hr> <p>The OP adds:</p> <blockquote> <p>It didn't work for me so i tried to transfer git repo to hg repo and from this repo pull to my working repo with changes - but it says that: abort: <strong>repository is unrelated</strong> - but I merged a lot from it. Any help here? </p> </blockquote> <p>That makes senses, if both repos have been developed separately, you cannot push/pull 2 (mercurial) repos one into another.<br> This is confirmed at the bottom of the page "<a href="http://mercurial.selenic.com/wiki/UnderstandingMercurial#What_Mercurial_can.27t_do" rel="nofollow noreferrer">Understanding Mercurial</a>", and detailed in the blog post: "<a href="http://kevin-berridge.blogspot.com/2009/05/what-mercurial-cant-do-subtree-repos.html" rel="nofollow noreferrer">What Mercurial Can't Do: Subtree Repos</a>".</p> <p>The more practical solution would be to make one <em>extra</em> repository (a "parent one") with your two repos declared in it as <strong><a href="http://mercurial.selenic.com/wiki/Subrepository?action=show&amp;redirect=subrepos" rel="nofollow noreferrer">nested repository</a></strong>.<br> It would keep both repos independent, allowing to push back to the GitHub repo from your second mercurial repo.</p> <p>If you don't have to push back to GitHub, but really want to have one repo in which you merge common files, then you can look in "<a href="https://stackoverflow.com/questions/1368080/merge-tip-from-an-unrelated-repository-with-mercurial">Merge tip from an unrelated repository with Mercurial</a>", but that is much more complex.</p> <p>I would rather:</p> <ul> <li>keep both repos separate</li> <li>delete from the first one the common files you need to merge in the second one.</li> <li>report and merge those common files in the second one.</li> </ul>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload