Mercurial: Changelog

Mercurial Mercurial > hg / changelog

Tue, 08 Mar 2011 10:03:01 -0600 wix: drop bin/ folder from MSI installers (issue 2673) stable

changeset

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.

Tue, 08 Mar 2011 11:01:01 +0100 zsh completion: remove computed default values from help texts

changeset

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.

Tue, 08 Mar 2011 01:21:50 +0100 merge: remove last traces of fastforward merging

changeset

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.

Mon, 07 Mar 2011 23:19:17 +0100 merge with stable

changeset

Patrick Mezard <pmezard@gmail.com> [Mon, 07 Mar 2011 23:19:17 +0100] rev 13560

merge with stable

Mon, 07 Mar 2011 23:02:04 +0100 subrepo: backout 67fbe566eff1, --force requires svn >= 1.5 stable

changeset

Patrick Mezard <pmezard@gmail.com> [Mon, 07 Mar 2011 23:02:04 +0100] rev 13559

subrepo: backout 67fbe566eff1, --force requires svn >= 1.5

Mon, 07 Mar 2011 15:46:46 -0600 merge with stable

changeset

Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:46:46 -0600] rev 13558

merge with stable