Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:12:26 -0500] rev 12315
merge with stable
Brodie Rao <brodie@bitheap.org> [Sun, 12 Sep 2010 18:05:53 -0500] rev 12314
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 16 Sep 2010 16:00:29 +0200] rev 12313
transplant: maintain list of transplants in dict
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 22:18:46 +0200] rev 12312
tests: unify test-hgignore
Pascal Quantin <pascal.quantin@gmail.com> [Thu, 16 Sep 2010 11:36:38 +0200] rev 12311
win32: update build instructions with correct CRT version
As stated in http://msdn.microsoft.com/en-us/library/cc664727.aspx, when you
compile an application with MSVC 2008 SP1 it is bound by default to the
original CRT version (9.0.21022.8). This is the case for Python 2.6 up to 3.1.
If the wrong CRT version is embedded in the Inno Setup installer, with a PC
that does not have the MSVC 2008 redistributable package installed, hg will
refuse to launch with an error: "the system cannot execute the specified
program".
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:07:22 -0500] rev 12310
merge with crew