David M. Carr <david@carrclan.us> [Thu, 03 Nov 2011 23:11:40 -0400] rev 15427
subrepo: update help for commit to reflect new default behavior
Update the subrepo help to be consistent with the new default behavior,
which is to abort if any subrepo is dirty.
Martin Geisler <mg@aragost.com> [Thu, 03 Nov 2011 14:40:58 +0100] rev 15426
merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 03 Nov 2011 10:52:58 -0200] rev 15425
i18n: disable translations with conflicting prompt keys (issue3082)
This is just a stopgap until a proper solution is implemented.
Matt Mackall <mpm@selenic.com> [Sun, 06 Nov 2011 14:40:31 -0600] rev 15424
log: hide hidden option until it actually does something
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 04 Nov 2011 00:40:47 +0100] rev 15423
phases: add a very simple test
Note that the expected output is wrong as is should be phase-1. But
the machinery to plant new root is to come in later commit.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 09 Oct 2011 14:25:04 +0200] rev 15422
phases: add a phase template keyword
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 18 Oct 2011 18:25:53 +0200] rev 15421
phases: add a phase method to context
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 04 Nov 2011 00:20:20 +0100] rev 15420
phases: add a cache allowing to know in which phase a changeset is