How can I update file in my working directory with a file from different branch?

Question

I am working in branch Feature and another developer has finished merging his branch Feature2 with Default. I would like to simply pull one of the files from the now default branch to my branch, before merging my feature (as it is not complete yet).

Answer 1

Mercurial works in changesets, not files, so you can't use traditional pull/push to do this.

You can use:

hg cat -r Feature2 path/to/thefile > path/to/thefile

to get a copy of the modified file. Or use:

hg revert -r Feature2 path/to/thefile

which does the same thing. You could also 'export' and 'import' using -I to include only that file, but there's no benefit in creating a new single-file changeset.

When later you merge into Default the identical files will merge cleanly.