Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 18 Jan 2010 15:38:31 -0200] rev 10259
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 18 Jan 2010 15:37:45 -0200] rev 10258
i18n-pt_BR: synchronized with 279c8a73fde1
Martin Geisler <mg@lazybytes.net> [Sat, 16 Jan 2010 02:40:00 +0100] rev 10257
Merge with stable
Greg Ward <greg-hg@gerg.ca> [Wed, 13 Jan 2010 22:05:06 -0500] rev 10256
share: be more explicit about the dangers of rollback.
Mads Kiilerich <mads@kiilerich.com> [Wed, 06 Jan 2010 03:27:15 +0100] rev 10255
mercurial.spec: Alignment with AIX spec by Jim Hague
* Require Python 2.4 or later
* Note that hgk uses tk - but don't require it
* Remove bashism to support ksh
* Install mq.el
* Handle uncompressed man pages
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 16 Jan 2010 02:33:06 +0100] rev 10254
hgweb: changenav: separate pages before and after the current position
This should allow styles to customize more precisely navigation bar,
for example inserting a cursor to show where we are in the navigation bar.
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