changeset 377:e5d769afd3ef

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: f73215065ecbcfd9a0d0964de5ed73a392837a56 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQqNywK+sNU5EO8RAiuOAJ4lL23LcxAkbPHy33snasBgrkhNxQCgkBLO ohB0/EA2dAvQtu5sMSW03D8= =lF8D -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 15 Jun 2005 21:13:49 -0800
parents b29219389b00 (current diff) fadc9e126369 (diff)
children 4e23eaffd4ae c8bd9793446d
files mercurial/hg.py mercurial/hgweb.py mercurial/revlog.py templates/changelogentry.tmpl templates/changeset.tmpl templates/fileannotate.tmpl templates/filediff.tmpl templates/filelogentry.tmpl templates/filerevision.tmpl templates/manifest.tmpl templates/map tests/test-conflict.out tests/test-tags.out tests/test-up-local-change.out
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hgweb.py	Wed Jun 15 21:13:08 2005 -0800
+++ b/mercurial/hgweb.py	Wed Jun 15 21:13:49 2005 -0800
@@ -563,7 +563,7 @@
                      footer = self.footer(),
                      repo = self.reponame,
                      file = file,
-                     filenode = hex(mf[file]),
+                     filenode = hex(mf.get(file, nullid)),
                      node = changeset,
                      rev = self.repo.changelog.rev(n),
                      p1 = hex(p1),