# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2006-12-16 20:51:22
# Node ID f2c4a2ee59ed8cd7fde6fbafe3b7aae59e628fb4
# Parent  dd86f99e3c02ba11f8375418cd90e81321973c28
# Parent  fe075ddf3272c9d0e6916a100ea66960ec743183

Merge with stable

diff --git a/contrib/convert-repo b/contrib/convert-repo
--- a/contrib/convert-repo
+++ b/contrib/convert-repo
@@ -85,7 +85,7 @@ class convert_git:
                 committer = " ".join(p[:-2])
                 if committer[0] == "<": committer = committer[1:-1]
                 committer = recode(committer)
-                message += "\ncommitter: %s\n" % v
+                message += "\ncommitter: %s\n" % committer
             if n == "parent": parents.append(v)
 
         tzs, tzh, tzm = tz[-5:-4] + "1", tz[-4:-2], tz[-2:]
@@ -295,7 +295,8 @@ class convert:
             nrev = self.dest.puttags(ctags)
             # write another hash correspondence to override the previous
             # one so we don't end up with extra tag heads
-            file(self.mapfile, "a").write("%s %s\n" % (c, nrev))
+            if nrev:
+                file(self.mapfile, "a").write("%s %s\n" % (c, nrev))
 
 gitpath, hgpath, mapfile = sys.argv[1:]
 if os.path.isdir(gitpath + "/.git"):