Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 20 Jun 2011 19:08:41 -0300] rev 14705
i18n: extract docstrings from fileset module
Martin Geisler <mg@aragost.com> [Tue, 21 Jun 2011 14:57:17 +0200] rev 14704
Backed out changeset 1ec8bd909ac3
Debug messages should not be translated.
Martin Geisler <mg@aragost.com> [Tue, 21 Jun 2011 14:00:26 +0200] rev 14703
merge with stable
David Soria Parra <dsp@php.net> [Tue, 21 Jun 2011 13:24:19 +0200] rev 14702
dispatch: translate alias debugging messages
Mads Kiilerich <mads@kiilerich.com> [Tue, 21 Jun 2011 00:17:52 +0200] rev 14701
parsers: fix localization markup of parser errors
Ollie Rutherfurd <orutherfurd@gmail.com> [Sun, 19 Jun 2011 22:33:25 -0400] rev 14700
fileset: use correct function name for hgignore in docstring
docstring refereed to "resolved" instead of "hgignore"
Matt Mackall <mpm@selenic.com> [Mon, 20 Jun 2011 16:45:33 -0500] rev 14699
url: catch UNC paths as yet another Windows special case (issue2808)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 20 Jun 2011 14:11:01 +0200] rev 14698
treediscovery: always return all remote heads
Old discovery only returned incoming heads, not all of them (for
changegroupsubset). New discovery must always return all of the remote heads
(for getbundle). I failed to properly adjust treediscovery in cb98fed52495
when introducing setdiscovery.
The actual observable problem was 'remote: unsynced changes' when trying
to push a cset on one named branch to a server with a new cset on another
named branch. This scenario is now tested in test-treediscovery.t.
Sune Foldager <cryo@cyanite.org> [Mon, 20 Jun 2011 11:08:41 +0200] rev 14697
merge with stable
Sune Foldager <cryo@cyanite.org> [Mon, 20 Jun 2011 10:51:37 +0200] rev 14696
config.sortdict: override clear method
Overrides dict.clear. It's not currently used, but was broken for sortdict.
Contributed by Stepan Koltsov <yozh@mx1.ru>