Tue, 01 May 2012 19:09:15 +0900 i18n-ja: synchronized with f2a3ce017355 stable 2.2
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 01 May 2012 19:09:15 +0900] rev 16561
i18n-ja: synchronized with f2a3ce017355
Tue, 01 May 2012 00:52:57 -0300 i18n-pt_BR: synchronized with 517b25608ad6 stable
Wagner Bruna <wbruna@yahoo.com> [Tue, 01 May 2012 00:52:57 -0300] rev 16560
i18n-pt_BR: synchronized with 517b25608ad6
Mon, 30 Apr 2012 16:06:37 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Mon, 30 Apr 2012 16:06:37 -0500] rev 16559
merge with i18n
Sun, 29 Apr 2012 21:15:06 +0900 i18n-ja: synchronized with be786c5ac0a8 stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 29 Apr 2012 21:15:06 +0900] rev 16558
i18n-ja: synchronized with be786c5ac0a8
Sun, 29 Apr 2012 20:58:50 +0200 changegroup: decompress GZ algorithm in larger chunks for better performance stable
Michael Tjørnemark <michael@tjornemark.dk> [Sun, 29 Apr 2012 20:58:50 +0200] rev 16557
changegroup: decompress GZ algorithm in larger chunks for better performance
Sat, 28 Apr 2012 23:01:31 -0700 plan9: mkfile and 9diff fixes stable
Steven Stallion <sstallion@gmail.com> [Sat, 28 Apr 2012 23:01:31 -0700] rev 16556
plan9: mkfile and 9diff fixes This patch deals with an unnecessary backslash in 9diff and improper quoting in the contrib mkfile.
Mon, 30 Apr 2012 17:05:19 +0200 subrepo/svn: cache _wcrev() value in merge() stable
Patrick Mezard <patrick@mezard.eu> [Mon, 30 Apr 2012 17:05:19 +0200] rev 16555
subrepo/svn: cache _wcrev() value in merge()
Mon, 30 Apr 2012 17:03:15 +0200 subrepo/svn: fix checked out rev number retrieval (issue2968) stable
Patrick Mezard <patrick@mezard.eu> [Mon, 30 Apr 2012 17:03:15 +0200] rev 16554
subrepo/svn: fix checked out rev number retrieval (issue2968) The initial version was to take the "Revision" field from svn info. It works but produces false positive when parent paths are being moved or unrelated changes are being committed, causing it to change while the svn checkout itself remains the same. To avoid spurious commit, we took "Revision" and "Last Changed Rev" for general comparison and kept the latter to answer "what is your revision?" question. This is better but fails when the subrepo path exists at "Revision" but not at "Last Changed Rev". This patch adds a check for this, and returns "Revision" if the path does not exist. We try to avoid doing this as much as possible at it implies an extra, *remote* call.
Mon, 30 Apr 2012 20:45:45 +0200 amend: fix copy records handling (issue3410) stable
Patrick Mezard <patrick@mezard.eu> [Mon, 30 Apr 2012 20:45:45 +0200] rev 16553
amend: fix copy records handling (issue3410) Messing with the dirstate before the intermediate commit seems error prone. Instead, commit and recompute the copies with copies.pathcopies(), then use that with commitctx(). Since copies.pathcopies() does not support file replacement very well, the whole .renamed() condition in samefile() is removed and the "file replacement caused by differing copy source" effect is discarded. Test shamelessly stolen from Idan Kamara <idankk86@gmail.com>
Mon, 30 Apr 2012 20:36:29 +0200 test-commit-amend: exhibit an --amend weirdness stable
Patrick Mezard <patrick@mezard.eu> [Mon, 30 Apr 2012 20:36:29 +0200] rev 16552
test-commit-amend: exhibit an --amend weirdness The weirdness is --amend let you replace one file with another with same data and flags if the new file copy record differ from the one in the parent revision. In theory, there is no problem with this kind of thing, subversion supports it, but here we see log and status disagree. The reason is log reads the copy record from the filelog, while status calls copies.pathcopies() which eventually invokes some expensiveness argument to discard this case (copies.py, _forwardcopies(), line 132). Since the next patch will side with pathcopies(), I prefer to call this behaviour a bug.
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip