Mercurial > hg-stable
changeset 3912:f2c4a2ee59ed
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 16 Dec 2006 14:51:22 -0600 |
| parents | dd86f99e3c02 (current diff) fe075ddf3272 (diff) |
| children | 6d0d025e125a |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/convert-repo Sat Dec 16 14:40:55 2006 +0100 +++ b/contrib/convert-repo Sat Dec 16 14:51:22 2006 -0600 @@ -85,7 +85,7 @@ 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 @@ 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"):