Mark Drago <markdrago@gmail.com> [Tue, 08 Mar 2011 08:41:39 -0500] rev 13568
commands.update() now works properly with a revision of 0
Without this change commands.update() treats an integer 0 as if no revision
was passed and updates to the branch head. This fix allows an integer 0 to
be detected as a revision number so the working directory is correctly
changed to revision 0 rather than the branch head.
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 14:55:31 -0600] rev 13567
merge with stable
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 13:35:01 -0600] rev 13566
mergetools: add alternate registry keys for 32bit apps on 64bit O/S
Not all applications needed the workarounds, so I did not add alternate keys for
every Windows merge application.
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 13:05:18 -0600] rev 13565
filemerge: introduce a 'regkeyalt' merge tool variable
This allows us to provide alternate search keys for 64bit operating systems that
may have 32bit merge tools installed. Presumably it may find other uses.
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 10:25:18 -0600] rev 13564
merge with stable
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 10:03:01 -0600] rev 13563
wix: drop bin/ folder from MSI installers (issue 2673)
Also fixes issue 2658.