Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/filelog.py @ 1543:93a9298367e0
Merge with Thomas Waldmann
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 14 Nov 2005 15:09:34 +0100 |
| parents | bf4e7ef08741 |
| children | dca956c9767d 11d12bd6e1dc |
line wrap: on
line diff
--- a/mercurial/filelog.py +++ b/mercurial/filelog.py @@ -54,11 +54,11 @@ class filelog(revlog): mt = "" if meta: mt = [ "%s: %s\n" % (k, v) for k,v in meta.items() ] - text = "\1\n" + "".join(mt) + "\1\n" + text + text = "\1\n%s\1\n%s" % ("".join(mt), text) return self.addrevision(text, transaction, link, p1, p2) def renamed(self, node): - if 0 and self.parents(node)[0] != nullid: + if 0 and self.parents(node)[0] != nullid: # XXX return False m = self.readmeta(node) if m and m.has_key("copy"):