##// END OF EJS Templates
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.

File last commit:

r10397:8cb81d75 default
r10521:bde1bb25 stable
Show More
test-mq-qfold.out
70 lines | 787 B | text/plain | TextLexer
/ tests / test-mq-qfold.out
Patrick Mezard
Add tests for qfold
r8426 % init
adding a
% fold in the middle of the queue
Mads Kiilerich
mq: qpop now tells which patches are popped...
r9110 popping p3
popping p2
Patrick Mezard
Add tests for qfold
r8426 now at: p1
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
a
+a
p1
p3
--- a/a
+++ b/a
@@ -1,1 +1,3 @@
a
+a
+b
% fold with local changes
abort: local changes found, refresh first
--- a/a
+++ b/a
@@ -1,1 +1,3 @@
a
+a
+b
Patrick Mezard
mq: preserve --git flag when folding patches...
r10186 reverting a
% fold git patch into a regular patch, expect git patch
popping git
now at: regular
Steve Losh
mq: add parent node IDs to MQ patches on qrefresh/qnew...
r10397 # HG changeset patch
# Parent
Patrick Mezard
mq: preserve --git flag when folding patches...
r10186 diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
a
a
b
+a
diff --git a/a b/aa
copy from a
copy to aa
--- a/a
+++ b/aa
@@ -1,3 +1,4 @@
a
a
b
+a
popping regular
now at: p1
% fold regular patch into a git patch, expect git patch
popping regular
now at: git
Steve Losh
mq: add parent node IDs to MQ patches on qrefresh/qnew...
r10397 # HG changeset patch
# Parent
Patrick Mezard
mq: preserve --git flag when folding patches...
r10186 diff --git a/a b/aa
copy from a
copy to aa
--- a/a
+++ b/aa
@@ -1,3 +1,4 @@
a
a
b
+b