I would not run everything at once. But there is a "hg fetch" extension that
combines pull and update or something else I don't know.
Also you should use "hg pull -r master", because there are different branches
in the repository now.
address@hidden glob2-hg]$ hg pull -r master
pulling from
https://hg.globulation2.org/glob2/http authorization required
realm: Enter your globulation 2 mercurial username
user: k776
password:
abort: Other repository doesn't support revision lookup, so a rev cannot be specified.
address@hidden glob2-hg]$
Yes, when you pull from https://... you have to type in your password.
Do "hg pull -r master http://..." instead.
Oh, I have no problems doing the password. See above for output of hg pull.
> Now I want to merge, but when I try:
When you don't code, you don't need to merge.
When you pull the <master> branch you just need to update.
Otherwise you might need to do "hg revert --all -r master",
but then "make" will recompile everything.
address@hidden glob2-hg]$ hg revert --all -r master
address@hidden glob2-hg]$ hg pull -r master
pulling from
https://hg.globulation2.org/glob2/http authorization required
realm: Enter your globulation 2 mercurial username
user: k776
password:
abort: Other repository doesn't support revision lookup, so a rev cannot be specified.
address@hidden glob2-hg]$
Same problem with pulling master.
As you can see update -C will not always work.