And now running my command "cd Games/glob2 && hg pull && cd ../glob2-core && hg pull -r core_rewrite_2007 ../glob2 && hg update && ./configure CXXFLAGS="-g -pg" && make && cd src/ && gdb glob2" which worked perfectly 16 hours ago, now returns:
pulling from http://hg.globulation2.org/glob2/ searching for changes adding changesets adding manifests adding file changes added 1 changesets with 4 changes to 4 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) (rather than:) pulling from http://hg.globulation2.org/glob2/ searching for changes adding changesets adding manifests adding file changes added 1 changesets with 4 changes to 4 files (run 'hg update' to get a working copy) (I pull to another directory though, so thankfully don't need to worry about merging, I hope!! ) On 6/2/07, Stéphane Magnenat <[EMAIL PROTECTED]> wrote:
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: [EMAIL PROTECTED]:~/data/project-perso/globulation/2.0/glob2$ hg push -r master pushing to https://[EMAIL PROTECTED]/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: [EMAIL PROTECTED]:~/data/project-perso/globulation/2.0/glob2$ hg push -r master -f pushing to https://[EMAIL PROTECTED]/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 [email protected] http://lists.nongnu.org/mailman/listinfo/glob2-devel
-- Kieran.P http://qlwiki.linuxsolutions.co.nz/
_______________________________________________ glob2-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/glob2-devel
