Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 09 Mar 2011 15:29:50 -0300] rev 13573
i18n-pt_BR: synchronized with 66d65bccbf06
Martin Geisler <mg@aragost.com> [Thu, 10 Mar 2011 13:43:47 +0100] rev 13572
tests: use $TESTTMP more and use (glob) less
This locks down the test output a little more.
Augie Fackler <durin42@gmail.com> [Fri, 07 Jan 2011 15:19:21 -0600] rev 13571
hgweb_mod: respond right away if the client specified 100-continue support
Clients that send 100-continue should make sure they really support
continue intelligently. In a later patch we'll introduce a capability so
new clients don't pay a performance penalty talking to old servers.
Augie Fackler <durin42@gmail.com> [Sat, 06 Feb 2010 04:27:28 -0600] rev 13570
hgweb: add support for 100-continue as recommended by PEP 333.
Eric Eisner <ede@mit.edu> [Tue, 08 Mar 2011 15:36:56 -0500] rev 13569
subrepo: show the source that git pulls
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