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.
Martin Geisler <mg@aragost.com> [Tue, 08 Mar 2011 11:01:01 +0100] rev 13562
zsh completion: remove computed default values from help texts
The default encoding and encoding mode are computed at runtime and can
vary from system to system. The two remaining default values in the
completion help texts (number of directories to strip on import and
default bundle name) are fixed in the source code.
Mads Kiilerich <mads@kiilerich.com> [Tue, 08 Mar 2011 01:21:50 +0100] rev 13561
merge: remove last traces of fastforward merging
bbc97d419b16 introduced fast-forward branch merging.
66ed92ed115a partly removed it again.
The fastforward variable would always be false if branchmerge was false, so the
fastforward variable makes no difference and we can remove it completely.
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Mar 2011 23:19:17 +0100] rev 13560
merge with stable
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Mar 2011 23:02:04 +0100] rev 13559
subrepo: backout 67fbe566eff1, --force requires svn >= 1.5
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:46:46 -0600] rev 13558
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:46:28 -0600] rev 13557
merge with i18n
David Soria Parra <dsp@php.net> [Sun, 06 Mar 2011 15:32:37 +0100] rev 13556
i18n-de: improve translation for "unmerged branches"
This translation issue was pointed out by Georg Brandl.
Steven Brown <StevenGBrown@gmail.com> [Mon, 07 Mar 2011 15:37:11 +0800] rev 13555
httprepo: order URL query string fields for readability
- cmd is always first, since the other fields are arguments to that command.
- The other fields are in alphabetical order, rather than random order.
example "hg serve" output
BEFORE
127.0.0.1 - - [26/Feb/2011 14:20:07] "GET /?bases=fa5962be1d87fe9a57244a14033550e192e57521+1a38f137b190482eaf0986594cd6e6b486c76fec&cmd=changegroupsubset&heads=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 14:00:50] "GET /?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 14:17:28] "GET /?nodes=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521&cmd=branches HTTP/1.1" 200 -
AFTER
127.0.0.1 - - [26/Feb/2011 14:21:28] "GET /?cmd=changegroupsubset&bases=fa5962be1d87fe9a57244a14033550e192e57521+1a38f137b190482eaf0986594cd6e6b486c76fec&heads=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 13:48:13] "GET /?cmd=between&pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 14:19:17] "GET /?cmd=branches&nodes=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:45:10 -0600] rev 13554
ancestor: improve description