##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Do not use osutil.c with python 2.4 and Windows (issue1364)...
Do not use osutil.c with python 2.4 and Windows (issue1364) Windows python 2.4 os.stat() reports times including DST offset, while osutil.c reports the correct value, which makes status() systematically compare files content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c is 4x times slower on large repositories but current code is completely unusable. Given few people are likely to use python 2.4 on Windows this solution was considered a good trade-off compared to more invasive solutions trying to address the offset issue.
Brendan Cully - - Load All Authors

File last commit:

r7440:d2a917b2 default
r10521:bde1bb25 stable
Show More
test-diff-unified.out
58 lines | 675 B | text/plain | TextLexer
/ tests / test-diff-unified.out
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
Let --unified default to diff.unified (issue 1076)
 r6467 adding a
% default context
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -2,7 +2,7 @@
c
a
a
-b
+dd
a
a
c
% invalid --unified
abort: diff context lines count must be an integer, not 'foo'
% --unified=2
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -3,5 +3,5 @@
a
a
-b
+dd
a
a
% diff.unified=2
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -3,5 +3,5 @@
a
a
-b
+dd
a
a
% diff.unified=2 --unified=1
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -4,3 +4,3 @@
a
-b
+dd
a
% invalid diff.unified
abort: diff context lines count must be an integer, not 'foo'
Dirkjan Ochtman
tests: fix test results for 07faba78cf5a
 r7437 % test off-by-one error with diff -p
adding a
diff -r cb9a9f314b8b a
Brendan Cully
Fix test breakage introduced in 07faba78cf5a
 r7440 --- a/a
+++ b/a
Dirkjan Ochtman
tests: fix test results for 07faba78cf5a
 r7437 @@ -1,0 +1,1 @@
+b
@@ -2,0 +3,1 @@ a
+c