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
Konstantin Zemlyak <zart@zartsoft.ru> [Mon, 22 Mar 2010 15:16:27 +0100] rev 10753
wsgicgi: call close() on iterable to avoid resource leaks
Quoting PEP 333 (WSGI):
"If the iterable returned by the application has a close() method, the server
or gateway must call that method upon completion of the current request,
whether the request was completed normally, or terminated early due to
an error. (This is to support resource release by the application.
This protocol is intended to complement PEP 325's generator support,
and other common iterables with close() methods."
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 22 Mar 2010 11:08:52 +0100] rev 10752
merge with mpm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 22 Mar 2010 11:08:42 +0100] rev 10751
patch: warn when the internal patcher fails
hopefully we'll soon fix the remaining failures from the internal patcher, and
not use the external one anymore.
Brodie Rao <brodie@bitheap.org> [Mon, 22 Mar 2010 01:36:12 -0400] rev 10750
run-tests: make sure GREP_OPTIONS isn't set
This can interfere with test output, especially for options like --color.
Matt Mackall <mpm@selenic.com> [Sat, 20 Mar 2010 16:57:24 -0500] rev 10749
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 20 Mar 2010 14:47:05 +0100] rev 10748
patch: more precise NoHunk, raised for every file (issue2102)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 20 Mar 2010 21:16:22 +0100] rev 10747
patch: differentiate start of file with diff --git vs '--- '
Matt Mackall <mpm@selenic.com> [Sat, 20 Mar 2010 10:01:56 -0500] rev 10746
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 19 Mar 2010 22:52:38 +0100] rev 10745
patch: try harder to find the file to patch on file creation (issue2041)
accept the following patch header:
first line: foo/a.orig
second line: foo/a
Matt Mackall <mpm@selenic.com> [Fri, 19 Mar 2010 16:05:16 -0500] rev 10744
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 19 Mar 2010 16:04:49 -0500] rev 10743
Merge with i18n
Matt Mackall <mpm@selenic.com> [Fri, 19 Mar 2010 16:04:00 -0500] rev 10742
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 16 Mar 2010 11:37:14 -0300] rev 10741
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 16 Mar 2010 11:36:44 -0300] rev 10740
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 16 Mar 2010 11:31:08 -0300] rev 10739
i18n-pt_BR: synchronized with e930017f9e2a
Martin Geisler <mg@lazybytes.net> [Sat, 06 Mar 2010 10:02:45 +0100] rev 10738
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 06 Mar 2010 08:58:03 +0000] rev 10737
l10n: Updates to Danish (da) translation
Transmitted-via: Transifex (www.transifex.net)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 19 Mar 2010 12:45:39 +0100] rev 10736
patch: second line of a context diff starts with '--- ', not '+++ '
Martin Geisler <mg@lazybytes.net> [Fri, 19 Mar 2010 11:32:55 +0100] rev 10735
Merge with stable
Cédric Duval <cedricduval@free.fr> [Mon, 15 Mar 2010 22:37:38 +0100] rev 10734
patchbomb: --desc implies --intro
For a single patch, an introductory text should not remain unsent
if --intro has been omitted, as the intent of --desc is clear.