Mercurial help ...

[Dragonfire]

I need help with my mercurial repo ...
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: Select all

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?

[Ze_PilOt]

It's not really an error.

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

[Dragonfire]

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

[Ze_PilOt]

No idea..

[Dragonfire]

Can I delete branches?
https://bitbucket.org/IDragonfire/modul ... at=default

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

[Ze_PilOt]

No, you have to close them if they are not used.
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.