Forged Alliance Forever Forged Alliance Forever Forums 2014-02-28T09:14:49+02:00 /feed.php?f=45&t=6815 2014-02-28T09:14:49+02:00 2014-02-28T09:14:49+02:00 /viewtopic.php?t=6815&p=67311#p67311 <![CDATA[Re: Mercurial help ...]]> Merging them in another branch so they are not "hanging" is a solution if you need these commits.

Actually as these branches seems to be my fault (a commit I did at work from a "bad" version), I will do that, so don't worry.

Just force the push for the moment :)
It's really more a warning than an error.

Statistics: Posted by Ze_PilOt — 28 Feb 2014, 09:14

]]> 2014-02-28T02:47:45+02:00 2014-02-28T02:47:45+02:00 /viewtopic.php?t=6815&p=67283#p67283 <![CDATA[Re: Mercurial help ...]]> https://bitbucket.org/IDragonfire/modul ... at=default


The default branch has multiple heads
55acc04 acb46c6 59c0ba8 5817bbe (current)

Statistics: Posted by Dragonfire — 28 Feb 2014, 02:47

]]> 2014-02-26T10:47:42+02:00 2014-02-26T10:47:42+02:00 /viewtopic.php?t=6815&p=67014#p67014 <![CDATA[Re: Mercurial help ...]]> Statistics: Posted by Ze_PilOt — 26 Feb 2014, 10:47

]]> 2014-02-26T10:41:35+02:00 2014-02-26T10:41:35+02:00 /viewtopic.php?t=6815&p=67011#p67011 <![CDATA[Re: Mercurial help ...]]>
Ze_PilOt wrote:
It's not really an error.

It just means that one of your branch has two heads.
Mercurial can create branches as needed.

Was force push the right solution?
Merging did not solve it ...

Statistics: Posted by Dragonfire — 26 Feb 2014, 10:41

]]> 2014-02-26T08:49:10+02:00 2014-02-26T08:49:10+02:00 /viewtopic.php?t=6815&p=66997#p66997 <![CDATA[Re: Mercurial help ...]]>
It just means that one of your branch has two heads.
Mercurial can create branches as needed.

Statistics: Posted by Ze_PilOt — 26 Feb 2014, 08:49

]]> 2014-02-26T03:39:18+02:00 2014-02-26T03:39:18+02:00 /viewtopic.php?t=6815&p=66985#p66985 <![CDATA[Mercurial help ...]]> https://bitbucket.org/thepilot/modular- ... ommits/all

I am only familiar with SVN, git, MKS ...
I pulled the changes from zep's main repo:
https://bitbucket.org/thepilot/modular- ... ommits/all

I had to force a push,
otherwise:
Code:
abort: push creates new remote head
merge or see "hg help push" for details about pushing new heads

but there were no files to merge :(
https://bitbucket.org/IDragonfire/modul ... ommits/all

My second try was successfull:
https://bitbucket.org/IDragonfire/modul ... ommits/all

What did I make wrong?
Why differ the two repos?

Statistics: Posted by Dragonfire — 26 Feb 2014, 03:39

]]>