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
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:05:00 -0500] rev 12309
merge with crew
Steve Borho <steve@borho.org> [Wed, 15 Sep 2010 17:48:03 -0500] rev 12308
Merge with 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.
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 20:41:14 +0200] rev 12306
tests: unify test-hardlinks-safety
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 18:00:09 +0200] rev 12305
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 16:27:39 +0200] rev 12304
tests: unify test-extdiff
Will Maier <willmaier@ml1.net> [Tue, 14 Sep 2010 22:26:43 -0500] rev 12303
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net> [Tue, 14 Sep 2010 21:45:43 -0500] rev 12302
bookmarks: set VALUE in push/pull
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 16:52:32 +0200] rev 12301
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 16:42:02 +0200] rev 12300
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 15:37:10 +0200] rev 12299
tests: unify test-update-renames
Adrian Buehlmann <adrian@cadifra.com> [Tue, 14 Sep 2010 13:43:05 +0200] rev 12298
tests: unify test-rename-merge1
Matt Mackall <mpm@selenic.com> [Wed, 15 Sep 2010 09:09:17 -0500] rev 12297
merge with crew
Sune Foldager <cryo@cyanite.org> [Wed, 15 Sep 2010 11:06:22 +0200] rev 12296
clone: only use stream when we understand the revlog format
This patch fixes issues with stream cloning in the presense of parentdelta,
lwcopy and similar additions that change the interpretation of the revlog
format, or the format itself.
Currently, the stream capability is sent like this:
stream=<version of changelog>
But the client doesn't actually check the version number; also, it only checks
the changelog and it doesn't capture the interpretation-changes and
flag-changes in parentdelta and lwcopy.
This patch removes the 'stream' capability whenever we use a non-basic revlog
format, to prevent old clients from receiving incorrect data. In those cases,
a new capability called 'streamreqs' is added instead. Instead of a revlog
version, it comes with a list of revlog-format relevant requirements, which
are a subset of the repository requirements, excluding things that are not
relevant for stream.
New clients use this to determine whether or not they can stream. Old clients
only look for the 'stream' capability, as always. New servers will still send
this when serving old repositories.
Sune Foldager <cryo@cyanite.org> [Wed, 15 Sep 2010 10:44:10 +0200] rev 12295
localrepo: factor out requirement application and write
Matt Mackall <mpm@selenic.com> [Tue, 14 Sep 2010 16:21:21 -0500] rev 12294
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 14 Sep 2010 16:21:01 -0500] rev 12293
merge with i18n
Matt Mackall <mpm@selenic.com> [Tue, 14 Sep 2010 16:20:34 -0500] rev 12292
merge with i18n
Christoph <christoph@webvariants.de> [Mon, 13 Sep 2010 01:37:56 +0000] rev 12291
l10n: starting to unify the old translations
New status: 1525 messages complete with 135 fuzzies and 621 untranslated.
Transmitted-via: Transifex (www.transifex.net).