Jim Hague <jim.hague@acm.org> [Wed, 06 Jan 2010 18:03:33 +0000] rev 10253
Work around AIX shell builtin printf not handling \NNN.
On AIX, ksh builtin printf does not understand \NNN. Some tests use this
to generate test data, and so fail on AIX. Rework these tests to use python
to generate the correct characters. This fixes the tests on AIX and should
be more generally portable.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 15 Jan 2010 21:32:53 +0100] rev 10252
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 15 Jan 2010 21:08:04 +0100] rev 10251
subrepo: fix merging of already merged subrepos (issue1986)
This fixes a bug seen when merging a main repo which contains a subrepo when
both repos have been merged before. Each repo (main and sub) has two
branches, both of which have been merged before.
In a subrepo, if the revision to merge to is an ancestor of the current rev,
then the merge should be a noop.
Test provided by Steve Losh.
Patrick Mezard <pmezard@gmail.com> [Fri, 15 Jan 2010 10:38:11 +0100] rev 10250
Merge with crew-stab le
Patrick Mezard <pmezard@gmail.com> [Fri, 15 Jan 2010 09:50:52 +0100] rev 10249
cmdutil: expand style paths (issue1948)
Fix suggested by Andrea Riciputi <andrea.riciputi@gmail.com>
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 14 Jan 2010 16:43:14 +0100] rev 10248
hgweb: add a test for search logs
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 14 Jan 2010 16:42:10 +0100] rev 10247
hgweb: add less/more links for search logs (issue1972)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 14 Jan 2010 16:28:21 +0100] rev 10246
hgweb: add less/more links to shortlog/filelog nav
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 14 Jan 2010 16:07:34 +0100] rev 10245
hgweb: make graph page size equal to shortlog
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 13 Jan 2010 12:00:06 +0100] rev 10244
merge with stable