Help, how did Mozilla do this?

Johnny P jpywtora at gmail.com
Wed Apr 10 19:49:39 UTC 2013


Ref: http://hg.mozilla.org/integration/gaia/graph

In the picture below I found Mozilla's mercurial repository graph with a
situation that I thought was not possible. They have two commits that have
the same parent where one is a merge. I have wanted to do this, but cannot
find an answer on how to, can anyone help?

    @ merge pull request from foo polish text
    |\
    | o bug 1 - add text ...
    |/
    o merge pull request from bar bug 2

How did they get this to occur? Usually when you pull changes in that add
onto the head, if you attempt to merge you get "nothing to merge".

Thanks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20130410/bb88cef3/attachment-0002.html>


More information about the Mercurial mailing list