##// 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.
Ronny Pfannschmidt - - Load All Authors

File last commit:

r10490:f2618cac stable
r12319:381f1312 stable
Show More
test-merge10.out
20 lines | 663 B | text/plain | TextLexer
/ tests / test-merge10.out
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
 r4696 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
merge: introduce mergestate
 r6512 merging testdir/subdir/a and testdir/a to testdir/subdir/a
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
 r4696 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M testdir/subdir/a
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
 r10490 diff -r f7459795031e testdir/subdir/a
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
 r4696 --- a/testdir/subdir/a
+++ b/testdir/subdir/a
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
 r4696 -a
+alpha