|
From: | Kieran P |
Subject: | Re: [glob2-devel] mercurial question: abort: push creates new remote branches! |
Date: | Sat, 2 Jun 2007 08:41:21 +1200 |
Hi everyone,
I've done the standard hg work cycle:
- hg clone -r master https://hg.globulation2.org/glob2/
then:
- hg pull -r master
- hg update (no conflict)
- hg commit -m "bla bla"
- hg push -r master
The commit complaints saying:
address@hidden:~/data/project-perso/globulation/2.0/glob2$ hg push -r master
pushing to https://address@hidden/glob2/
http authorization required
realm: Enter your globulation 2 mercurial username
user: nct
password:
searching for changes
abort: push creates new remote branches!
(did you forget to merge? use push -f to force)
If I force it works but says it has created a new head:
address@hidden:~/data/project-perso/globulation/2.0/glob2$ hg push -r
master -f
pushing to https://address@hidden/glob2/
http authorization required
realm: Enter your globulation 2 mercurial username
user: nct
password:
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files (+1 heads)
I've searched the web but didn't find anything usefull related to this.
Does anyone has an idea of this behavior.
Thanks,
Steph
--
http://stephane.magnenat.net
_______________________________________________
glob2-devel mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/glob2-devel
[Prev in Thread] | Current Thread | [Next in Thread] |