Question

Within TortoiseHg, I can set the option to automatically Update after a Pull? Is there a way to set this automatic Update to always Merge? I.e., have the automatic Update work the same way a manual update does when you choose the "Always merge (when possible)" option?

Answer 1

If you are willing to use the command line, you can try the fetch extension hg fetch which does all of that stuff for you. It's automatically installed when you install the Kiln client tools. Unfortunately, it doesn't expose itself in the Tortoise sync interface, so there is no way to use it from the GUI right now.

Answer 2

hg fetch does expose itself within the TortoiseHg interface.

Open a Synchronize window, and from the Post Pull dropdown, select Fech. This will do it for just this one time.

If you want to set this up as a default, click the Configure button in the toolbar. This brings up the default settings for the repository. From the dropdown in the upper-left that says "Server repository settings", change the selection to "User global settings."

Make sure Synchronize is still selected on the left, and then on the right, near the top, change the After Pull Operation dropdown value to fetch.

Click OK to save your changes.

For reference, this was done with TortoiseHg Version 1.0.1, as installed by the Kiln Client installer.