Wed, 28 Mar 2012 10:11:12 -0500 tests: eliminate daemon race in test-bad-pull stable
Matt Mackall <mpm@selenic.com> [Wed, 28 Mar 2012 10:11:12 -0500] rev 16296
tests: eliminate daemon race in test-bad-pull
Tue, 27 Mar 2012 16:17:46 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 16:17:46 -0500] rev 16295
merge with stable
Tue, 27 Mar 2012 16:13:59 -0500 alias: abort on missing positional args (issue3331) stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 16:13:59 -0500] rev 16294
alias: abort on missing positional args (issue3331)
Wed, 15 Feb 2012 17:30:21 -0500 phases: fix a non-standard debug message stable
Greg Ward <greg@gerg.ca> [Wed, 15 Feb 2012 17:30:21 -0500] rev 16293
phases: fix a non-standard debug message - add missing newline - ditch gratuitous use of string formatting with dict - fix so it actually does string formatting ('%' rather than ',') - inline unnecessary local variable - downcase first word
Sat, 24 Mar 2012 22:13:17 -0500 convert/git: abort if git submodules are detected (issue2150) stable
Augie Fackler <durin42@gmail.com> [Sat, 24 Mar 2012 22:13:17 -0500] rev 16292
convert/git: abort if git submodules are detected (issue2150) This improves the error message when convert encounters a git submodule. Now, instead of a git-cat-file error, we'll directly report the lack of support for git submodules.
Tue, 27 Mar 2012 14:37:17 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 14:37:17 -0500] rev 16291
merge with stable
Sat, 24 Mar 2012 12:06:49 +0100 qfinish: comply with the phases.new-commit option in secret mode (issue3335) 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.
Wed, 21 Mar 2012 22:16:12 -0400 test-gpg: make sure gpg does not modify the trustdb.gpg file stable
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.
Tue, 27 Mar 2012 13:57:54 -0500 tests: remove case-folding false positive stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 13:57:54 -0500] rev 16288
tests: remove case-folding false positive
Tue, 27 Mar 2012 14:35:58 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 14:35:58 -0500] rev 16287
merge with i18n
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip