Thu, 16 Sep 2010 16:12:26 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:12:26 -0500] rev 12315
merge with stable
Sun, 12 Sep 2010 18:05:53 -0500 merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
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.
Thu, 16 Sep 2010 16:00:29 +0200 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 16 Sep 2010 16:00:29 +0200] rev 12313
transplant: maintain list of transplants in dict
Wed, 15 Sep 2010 22:18:46 +0200 tests: unify test-hgignore
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 22:18:46 +0200] rev 12312
tests: unify test-hgignore
Thu, 16 Sep 2010 11:36:38 +0200 win32: update build instructions with correct CRT version
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".
Thu, 16 Sep 2010 16:07:22 -0500 merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:07:22 -0500] rev 12310
merge with crew
Thu, 16 Sep 2010 16:05:00 -0500 merge with crew stable
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:05:00 -0500] rev 12309
merge with crew
Wed, 15 Sep 2010 17:48:03 -0500 Merge with stable
Steve Borho <steve@borho.org> [Wed, 15 Sep 2010 17:48:03 -0500] rev 12308
Merge with stable
Wed, 15 Sep 2010 17:46:51 -0500 eol: setup the repo.ui in reposetup() stable
Steve Borho <steve@borho.org> [Wed, 15 Sep 2010 17:46:51 -0500] rev 12307
eol: setup the repo.ui in reposetup() This fixes problems some have reported using the eol extension together with TortoiseHg. It ensures the ui associated with the repository has the preupdate.eol hook configured.
Wed, 15 Sep 2010 20:41:14 +0200 tests: unify test-hardlinks-safety
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 20:41:14 +0200] rev 12306
tests: unify test-hardlinks-safety
Wed, 15 Sep 2010 18:00:09 +0200 tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 18:00:09 +0200] rev 12305
tests: unify test-extra-filelog-entry
Wed, 15 Sep 2010 16:27:39 +0200 tests: unify test-extdiff
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 16:27:39 +0200] rev 12304
tests: unify test-extdiff
(0) -10000 -3000 -1000 -300 -100 -12 +12 +100 +300 +1000 +3000 +10000 +30000 tip