Mon, 22 Mar 2010 11:08:52 +0100 merge with mpm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 22 Mar 2010 11:08:52 +0100] rev 10752
merge with mpm
Mon, 22 Mar 2010 11:08:42 +0100 patch: warn when the internal patcher fails
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.
Mon, 22 Mar 2010 01:36:12 -0400 run-tests: make sure GREP_OPTIONS isn't set
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.
Sat, 20 Mar 2010 16:57:24 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 20 Mar 2010 16:57:24 -0500] rev 10749
Merge with stable
Sat, 20 Mar 2010 14:47:05 +0100 patch: more precise NoHunk, raised for every file (issue2102) 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)
Sat, 20 Mar 2010 21:16:22 +0100 patch: differentiate start of file with diff --git vs '--- ' stable
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 '--- '
Sat, 20 Mar 2010 10:01:56 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 20 Mar 2010 10:01:56 -0500] rev 10746
Merge with stable
Fri, 19 Mar 2010 22:52:38 +0100 patch: try harder to find the file to patch on file creation (issue2041) 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
Fri, 19 Mar 2010 16:05:16 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 19 Mar 2010 16:05:16 -0500] rev 10744
Merge with stable
Fri, 19 Mar 2010 16:04:49 -0500 Merge with i18n
Matt Mackall <mpm@selenic.com> [Fri, 19 Mar 2010 16:04:49 -0500] rev 10743
Merge with i18n
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip