Automatic shelve before pulling in Mercurial (with TortoiseHG)?

Question

I have some changed files I don\'t want to commit (e.g. web.config). Before I pull and update to new changesets, I have to shelve them. After the pull & update, I have

Answer 1

In Mercurial, just hg pull -u. Uncommitted changes are merged with the tip. Same result as shelve, pull/update, unshelve. With TortoiseHg a dialog will come up prompting for discard/shelve/merge.

You may get a merge dialog this way but that would be true with the shelving approach because unshelve may have to merge as well. From the command line you won't get a prompt if there are no conflicts. TortoiseHg may have an option to suppress the dialog if there are no conflicts, but I haven't checked.