Fri, 11 Nov 2011 02:33:01 +0900 largefiles: treat status of cache missed largefiles as "missing" correctly stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 11 Nov 2011 02:33:01 +0900] rev 15472
largefiles: treat status of cache missed largefiles as "missing" correctly "hg status" may treat cache missed largefiles as "removed" incorrectly. assumptions for problem case: - there is no cache for largefile "L" - at first, update working directory to the revision in which "L" is not yet added, - then, update working directory to the revision in which "L" is already added and now, "hg status" treats "L" as "removed". current implementation does not allocate entry for cache missed largefile in ".hg/largefiles/dirstate", but files without ".hg/largefiles/dirstate" entry are treated as "removed" by largefiles extension. "hg revert" can not recover from this situation, but "rm -rf .hg/largefiles", because it causes dirstate rebuilding. this patch invokes normallookup() for cache missed largefiles to allocate entry in ".hg/largefiles/dirstate", so "hg status" can treat it as "missing" correctly.
Thu, 10 Nov 2011 11:00:27 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 11:00:27 -0600] rev 15471
merge with stable
Thu, 10 Nov 2011 11:00:02 -0600 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 11:00:02 -0600] rev 15470
merge with i18n
Tue, 08 Nov 2011 17:09:48 +0100 rebase: ensure target is not taken as external (issue3085) stable
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Tue, 08 Nov 2011 17:09:48 +0100] rev 15469
rebase: ensure target is not taken as external (issue3085) This could happen in specific situations in which 'target' was selected as external and used for p1 _and_ p2.
Thu, 10 Nov 2011 10:59:03 -0600 merge with i18n
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 10:59:03 -0600] rev 15468
merge with i18n
Wed, 09 Nov 2011 19:01:10 +0100 i18n: merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 09 Nov 2011 19:01:10 +0100] rev 15467
i18n: merge with stable
Wed, 09 Nov 2011 18:58:17 +0100 i18n-da: add new strings from Mercurial 2.0 stable
Martin Geisler <mg@lazybytes.net> [Wed, 09 Nov 2011 18:58:17 +0100] rev 15466
i18n-da: add new strings from Mercurial 2.0
Wed, 09 Nov 2011 18:26:54 +0100 i18n-ru: fix translation of --logfile (issue3095) stable
Martin Geisler <mg@lazybytes.net> [Wed, 09 Nov 2011 18:26:54 +0100] rev 15465
i18n-ru: fix translation of --logfile (issue3095)
Sun, 06 Nov 2011 23:35:33 +0100 rebase: treat nullmerge as a special case in rebasestate (issue3046) stable
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sun, 06 Nov 2011 23:35:33 +0100] rev 15464
rebase: treat nullmerge as a special case in rebasestate (issue3046) When storing/restoring a nullmerge (-2), a 'standard' conversion was made and an existing changeset was wrongly used. Nullmerge should instead be treated as a special case.
Tue, 08 Nov 2011 21:31:39 +0100 graft: mark a string for translation stable
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Tue, 08 Nov 2011 21:31:39 +0100] rev 15463
graft: mark a string for translation
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip