hg and merging...

[Stuart Axon]

So if I want to push the changes in
http://freehg.org/u/stuaxo/shoebot/
to main

Do I need to something like
hg merge (main-shoebot-repository)

then
hg push (main-shoebot-repository)

?

[ricardo lafuente]

there's a safer way:

1. clone your freehg repo (or use an existing local copy)
2. pull the changes from the main repo (goto10) into your local copy
3. it should have created a new head if you made changes to a file which
was also changed in the main repo
4. hg merge on your local copy
5. resolve merge conflicts, if any
6. push to main repo
7. profit

i don't think it's a good idea to do a remote merge; i always do it this
way when i get the 'push creates remote heads' message.

Post by Stuart Axon
So if I want to push the changes in
http://freehg.org/u/stuaxo/shoebot/
to main
Do I need to something like
hg merge (main-shoebot-repository)
then
hg push (main-shoebot-repository)
?
_______________________________________________
Shoebot-devel mailing list
http://lists.tinkerhouse.net/listinfo.cgi/shoebot-devel-tinkerhouse.net