diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py --- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -12,19 +12,20 @@ from util import * def unidiff(a, ad, b, bd, fn, r=None, text=False): if not a and not b: return "" + epoch = datestr((0,0)) if not text and (binary(a) or binary(b)): l = ['Binary file %s has changed\n' % fn] elif a == None: b = b.splitlines(1) - l1 = "--- %s\t%s\n" % ("/dev/null", ad) + l1 = "--- %s\t%s\n" % ("/dev/null", epoch) l2 = "+++ %s\t%s\n" % ("b/" + fn, bd) l3 = "@@ -0,0 +1,%d @@\n" % len(b) l = [l1, l2, l3] + ["+" + e for e in b] elif b == None: a = a.splitlines(1) l1 = "--- %s\t%s\n" % ("a/" + fn, ad) - l2 = "+++ %s\t%s\n" % ("/dev/null", bd) + l2 = "+++ %s\t%s\n" % ("/dev/null", epoch) l3 = "@@ -1,%d +0,0 @@\n" % len(a) l = [l1, l2, l3] + ["-" + e for e in a] else: