Re: [glob2-devel] don't use "hg push -f" as default

[Kieran P]

Hey Kai,

As far as I know, -f has only been used once recently, and that was to create the new branch glob2-network, the one genixpro is current working on.

I also committed my windows changes to this branch, using

http push -r glob2-network https://hg.globulation2.org/glob2/

which as far as I can tell, worked fine.

Did something go wrong?

Regards
Kieran

On Sun, Feb 10, 2008 at 8:49 AM, Kai Antweiler <address@hidden> wrote:

Hi *,

recently some (wrong) extra heads have been created in our repository.
This happens (e.g.), if you "hg push -f" a revision and someone else
has pushed before.

If you use "hg push" without "-f", mercurial will warn you and exit in
such cases.
Then you can use "hg incoming ...#default" or ("hg pull ...#default"
and "hg glog -l 4) to see what's wrong.

If you come to the conclusion, that creating a new head is the best thing
that you can do in this situation, then you can still use "hg push -f".

If you see that someone has pushed a new revision, you problably want to merge:
# hg pull http://hg.globulation2.org/glob2#default
# hg merge
# hg commit -m "merged my and xy commits"
# hg push https://hg.globulation2.org/glob2

If you know beforehand, that you want to create a new head (probably
due to a new
named branch), then you should use "hg push -f ..." directly.
--
Kai Antweiler