Patrick Mezard <pmezard@gmail.com> [Tue, 23 Mar 2010 22:59:31 +0100] rev 10763
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 23 Mar 2010 20:45:08 +0100] rev 10762
rebase: fix --collapse with --keepbranches (issue2100)
This was broken in 38fe86fb16e3.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 23 Mar 2010 20:01:30 +0100] rev 10761
setup: fail if bz2 is not available
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 22 Mar 2010 22:19:40 +0100] rev 10760
test-convert-cvs: filter unstable cvs output.
The order choosen by cvs to display commit is not stable when the tests are run
under heavy CPU/IO load. This leads to irrelevant failures of the test suite.
This changeset filters four lines impacted by this instability. The result of
the conversion is still verified.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 23 Mar 2010 11:48:14 +0100] rev 10759
help: point out need for stringification
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 11:37:31 +0100] rev 10758
tests: adapt the test runner to work with jython
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 11:37:01 +0100] rev 10757
posix: move a global fcntl import to keep it from breaking jython
Only needed on darwin, anyway.
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 11:36:19 +0100] rev 10756
util: fake the builtin buffer if it's missing (jython)
Patrick Mezard <pmezard@gmail.com> [Tue, 23 Mar 2010 10:18:46 +0100] rev 10755
mq: fix qcommit documentation wrt --mq option
Matt Mackall <mpm@selenic.com> [Mon, 22 Mar 2010 17:03:33 -0500] rev 10754
Merge with stable