Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 14:37:17 -0500] rev 16291
merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 24 Mar 2012 12:06:49 +0100] rev 16290
qfinish: comply with the phases.new-commit option in secret mode (issue3335)
In secret mode qfinished changeset were move to the draft phase in all case[1]
without regard to phases.new-commit value
This changeset ensure qfinish does not automatically promote a changeset
further than the phases.new-commit value.
Note: This may also result in qfinished changeset made public if
phases.new-commit is set to public.
[1] "In all case" where parent have a compatible phase. Qfinish keep never
altering phases of changeset not involved in the qfinish.
Greg Ward <greg@gerg.ca> [Wed, 21 Mar 2012 22:16:12 -0400] rev 16289
test-gpg: make sure gpg does not modify the trustdb.gpg file
Tests really should not modify files in the Mercurial working dir
where they ran from! I suspect that trustdb.gpg is now old enough that
GPG thinks it should update it automatically. Suppress that feature
with --no-auto-check-trustdb.
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 13:57:54 -0500] rev 16288
tests: remove case-folding false positive
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 14:35:58 -0500] rev 16287
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 27 Mar 2012 20:37:52 +0900] rev 16286
i18n-ja: synchronized with 900eee0778d1
Matt Mackall <mpm@selenic.com> [Mon, 26 Mar 2012 16:42:53 -0500] rev 16285
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 26 Mar 2012 16:41:54 -0500] rev 16284
merge: fix unknown file merge detection for case-folding systems
This was triggering some test failures on Mac.