On Tue, Oct 19, 2010 at 7:14 AM, Gavin Barrett <[email protected]> wrote: > What function is performed when you click the checkbox "always merge (when > possible)" on the TortoiseHg->update screen? What is the difference between > checking the box and not checking it? Does checking the box > simply trigger an "hg merge" straight after the "hg udpate"?
The key to understanding this is to know that "updating" to a descendant revision when your working copy has uncommitted changes is the same as: 1) checking in your changes 2) merging to the changeset you are updating to 3) undo-ing the commt And this is not too far from the way it is handled internally by Mercurial. It uses its three-way merge machinery to merge your uncommitted changes into the update revision. If there are conflicts, it will launch your preferred merge tool. And you can restart complicated file merges using the resolve command (your original file is maintained until you mark the merge as resolved and commit). Checking that box tells TortoiseHg that you always want to do this merge behavior when you update with uncommitted changes. Not-checking it allows TortoiseHg to give you other options, like shelving your changes or discarding them. Checking the box gives you essentially the command line "hg update" behavior. Not-checking it is more friendly for new users. -- Steve Borho ------------------------------------------------------------------------------ Download new Adobe(R) Flash(R) Builder(TM) 4 The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly Flex(R) Builder(TM)) enable the development of rich applications that run across multiple browsers and platforms. Download your free trials today! http://p.sf.net/sfu/adobe-dev2dev _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
