Merging from another clone with my own clone before pushing to main clone?

Question

Hi,

I am working on a project being version controlled by mercurial.

I have a clone. My friend has a clone.

My friend made some changes to his clone, and then pushed them to the main clone. I have made some changes to my clone, and am ready to push to the main clone. However, I want to incorporate his changes into my own clone, before I push to the main clone (I think that's the right way to go?)

How can I do this?

Thank you

Answer 1

hg pull -u from the main clone. This will get all new changes from the main clone (including your friend's) and update your working copy.