How do I merge local changes if any (other changes otherwise) in Mercurial?

There are two heads on my repository. I have five files that I've edited locally. The Bitbucket repo has 15 changed files that开发者_如何转开发 I haven't edited, but it also contains changed versions of the same 5 files.

I'd like to do the following:

1) If I've edited a file and the Bitbucket repo contains the same edited file, I'd like my changes to take preference.

2) If I haven't edited a file, I'd like to update to the latest version.

What sequence of commands in Mercurial will let me do this? Do I have to use an external program?

WITH LOCAL COMMITS

hg pull
hg update --rev ${my version}
hg merge --rev ${their version} --tool internal:local

See also hg help merge-tools

WITHOUT LOCAL COMMITS

hg status -qn gives you a list of files you have changed. Since it's only five files, I'd copy them away manually, then revert, pull, update and copy them back into place. On unix you could write a throw-away shell script, something that goes kinda' like this:

ls -l *.mine # check to see that there are none
for file in `hg status -qn`; do cp ${file} ${file}.mine; done
hg revert --all; hg pull; hg update
for file in *.mine; do cp ${file} ${file%.mine}; done

This is untested code. Run it at your own risk. Eat muffins and be happy.

just do

hg pull
hg merge

This will pull the latest changes from bitbucket and allow you to merge your local changes the way you want.

This is really a basic functionality, you should read some documentation about mercurial, for example HG Init like said in the comments.