Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 02:44:04 +0100] rev 15435
tests: make '(esc)' matching in run-tests.py work as intended
The code for match on (esc) lines didn't work, and it would thus always end up
emitting another suggestion ... which however would match the old one.
Matt Mackall <mpm@selenic.com> [Mon, 07 Nov 2011 13:46:41 -0600] rev 15434
run-tests: replace inline python handling with more native scheme
Normally changes in tests are reported like this in diffs:
$ cat foo
- a
+ b
Using -i mode lets us update tests when the new results are correct
and/or populate tests with their output.
But with the standard doctest framework, inline Python sections in
tests changes instead result in a big failure report that's unhelpful.
So here, we replace the doctest calls with a simple compile/eval loop.
Matt Mackall <mpm@selenic.com> [Mon, 07 Nov 2011 13:46:39 -0600] rev 15433
merge with crew
Martin Geisler <mg@aragost.com> [Fri, 04 Nov 2011 10:39:04 +0100] rev 15432
merge with stable
Martin Geisler <mg@aragost.com> [Fri, 04 Nov 2011 10:32:13 +0100] rev 15431
merge with main
Martin Geisler <mg@aragost.com> [Fri, 04 Nov 2011 10:31:38 +0100] rev 15430
merge with main
David M. Carr <david@carrclan.us> [Thu, 03 Nov 2011 23:12:31 -0400] rev 15429
subrepo: improve help for svn subrepo support
Add details on which commands are supported for Subversion subrepos.
David M. Carr <david@carrclan.us> [Thu, 03 Nov 2011 23:12:30 -0400] rev 15428
subrepo: improve help for git subrepo support
Add details on which commands are supported for git subrepos.
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