Re: [glob2-devel] first steps in mercurial

[Kieran P]

For startersl hg branch isn't right. To create a branch locally, you have to use, once the latest code is on your computer:

$ hg clone project project-work    # create a new branch
$ cd project-work
$ <make changes>
$ hg commit                               #to local repository

That should commit it to your branch on the main repository. Then if you are finished and want to submit you work to the main branch (after its working), 

$ cd ../project                        # the latest code from the repository
$ hg pull ../project-work           # pull changesets from project-work
$ hg merge                            # merge the new tip from project-work into our working directory
$ hg commit                           # commit the result of the merge to the main line of development locally
$ hg push 
https://hg.globulation2.org/glob2/


And that should work in theory. Hope this helps.



Hope this answers some questions.

(you might want to revert the file back to the old).

On 4/22/07, Leo Wandersleb <address@hidden> wrote:

hi guys

i guess i just did something wrong but i can't quite tell:
i committed a change in unit assignment that seams to work as desired but is barely tested and shows some minor bugs i wouldn't want to commit to HEAD.

Now my branching attempts failed i guess so the commit went into HEAD.
How do i do branches on the remote repository??
i said
address@hidden:~/globulation/hg/glob2$ hg branch unitAssignmentByLeo
address@hidden:~/globulation/hg/glob2$ hg commit
address@hidden:~/globulation/hg/glob2$ hg push https://address@hidden/glob2/
...
abort: push creates new remote branches!
(did you forget to merge? use push -f to force)
address@hidden:~/globulation/hg/glob2$ hg push -f https://address@hidden/glob2/

hmm.. now what's that?

Greetings, Leo Wandersleb

-- 
Kieran.P
http://qlwiki.linuxsolutions.co.nz/