Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 15:08:51 -0600] rev 15475
hgweb: add hint about finding library path with debuginstall
David M. Carr <david@carrclan.us> [Wed, 09 Nov 2011 19:46:51 -0500] rev 15474
forget: support forgetting explicit paths in subrepos
Change the behavior of the forget command such that explicit paths in
subrepos are handled by forgetting the file in the subrepo. This eliminates the
previous behavior where if you called "hg forget" for an explicit path in a
subrepo, it would state that the file is already untracked.
David M. Carr <david@carrclan.us> [Wed, 09 Nov 2011 19:46:49 -0500] rev 15473
tests: add test for behavior of forget for explicit path in subrepo
Adds a section to test-subrepo.t that demonstrates the current behavior
when you pass the full path to a file in a subrepo to hg forget.
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.
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 11:00:27 -0600] rev 15471
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 11:00:02 -0600] rev 15470
merge with i18n
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.
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 10:59:03 -0600] rev 15468
merge with i18n
Martin Geisler <mg@lazybytes.net> [Wed, 09 Nov 2011 19:01:10 +0100] rev 15467
i18n: merge with 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