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

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

archive: set date to 1980 for very old zip files...
archive: set date to 1980 for very old zip files The zip file format stores the date using "MS-DOS format" which apparently means that they use 1980 as their epoch. Python's zipfile module emits deprecation warnings of this form /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: struct integer overflow masking is deprecated self.fp.write(zinfo.FileHeader()) /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: 'H' format requires 0 <= number <= 65535 self.fp.write(zinfo.FileHeader()) /home/mg/src/mercurial-crew/mercurial/archival.py:169: DeprecationWarning: struct integer overflow masking is deprecated self.z.close() /home/mg/src/mercurial-crew/mercurial/archival.py:169: DeprecationWarning: 'H' format requires 0 <= number <= 65535 self.z.close() when it is given such old timestamps. This fixes this by silently clamping the date to 1980.
Steve Losh - - Load All Authors

File last commit:

r10397:8cb81d75 default
r12319:381f1312 stable
Show More
test-mq-qfold.out
70 lines | 787 B | text/plain | TextLexer
/ tests / test-mq-qfold.out
History | Source | Raw |Copy content |Copy permalink
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