Andrey Somov <py4fun@gmail.com> [Thu, 10 Nov 2011 22:05:02 +0100] rev 15638
i18n-ru: update translation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 12 Dec 2011 17:10:19 +0900] rev 15637
icasefs: use util.normcase() instead of str.lower() or os.path.normpath()
Martin Geisler <mg@lazybytes.net> [Thu, 15 Dec 2011 16:26:33 +0100] rev 15636
merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 15 Dec 2011 16:18:10 +0100] rev 15635
test-subrepo: test for Issue3153
Renato Cunha <renato@renatocunha.com> [Wed, 14 Dec 2011 12:28:00 -0200] rev 15634
diff: don't crash when diffing a revision with a deleted subrepo (issue3153)
When a user requested a diff between a revision (r1) that contained a subrepo
and another (r2) that did not, mercurial would crash if r1 was specified before
r2 but would execute the diff otherwise. This fixes this behavior by skipping
the missing subrepo in the diff.
Martin Geisler <mg@lazybytes.net> [Thu, 15 Dec 2011 11:13:38 +0100] rev 15633
status: add missing ":" to help text
Martin Geisler <mg@lazybytes.net> [Sat, 10 Dec 2011 18:40:05 +0100] rev 15632
dispatch: remove extra newline
The return statement belongs to the lines above.
Ion Savin <comp_@gmx.net> [Fri, 09 Dec 2011 14:14:30 +0200] rev 15631
annotate: show full changeset hash when invoked with --debug and -c
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:58:12 +0100] rev 15630
merge with stable
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:34:58 +0100] rev 15629
largefiles: fix 'hg status' abort after merge
If a largefile is introduced on the branch that is merged into the
working copy, then 'hg status' would abort with an error like:
$ hg status
abort: .hglf/foo@33fdd332ec64: not found in manifest!
The problem was that the largefiles status code only looked in the
first parent for the largefile. Largefiles are now always reported as
modified if they don't exist in the first parent -- this matches the
behavior of localrepo.status for normal files.