# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1182625888 -7200
# Node ID 54a2b94a372c6a5bf76ce70256a5061a377e8e03
# Parent  39001f4b7d993cce58a0aae75c96fec7a1acdb21# Parent  8f91264f154aba47a779bffad6a6f660dd607622
merge with main

diff -r 39001f4b7d99 -r 54a2b94a372c hgext/convert/git.py
--- a/hgext/convert/git.py	Sat Jun 23 21:10:55 2007 +0200
+++ b/hgext/convert/git.py	Sat Jun 23 21:11:28 2007 +0200
@@ -82,6 +82,7 @@
         tzs, tzh, tzm = tz[-5:-4] + "1", tz[-4:-2], tz[-2:]
         tz = -int(tzs) * (int(tzh) * 3600 + int(tzm))
         date = tm + " " + str(tz)
+        author = author or unknown
 
         c = commit(parents=parents, date=date, author=author, desc=message)
         return c
diff -r 39001f4b7d99 -r 54a2b94a372c mercurial/archival.py
--- a/mercurial/archival.py	Sat Jun 23 21:10:55 2007 +0200
+++ b/mercurial/archival.py	Sat Jun 23 21:11:28 2007 +0200
@@ -133,7 +133,6 @@
     def addfile(self, name, mode, data):
         i = zipfile.ZipInfo(self.prefix + name, self.date_time)
         i.compress_type = self.z.compression
-        i.flag_bits = 0x08
         # unzip will not honor unix file modes unless file creator is
         # set to unix (id 3).
         i.create_system = 3