# HG changeset patch
# User mpm@selenic.com
# Date 1118898829 28800
# Node ID e5d769afd3efc56d0e7cd7e792cefd2be54b26f2
# Parent  b29219389b003780cb30b48d5f70ed8bc8e5899b# Parent  fadc9e1263690fbfba430f0a95845373644c1516
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-----


diff -r b29219389b00 -r e5d769afd3ef mercurial/hg.py
diff -r b29219389b00 -r e5d769afd3ef mercurial/hgweb.py
--- 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),
diff -r b29219389b00 -r e5d769afd3ef mercurial/revlog.py
diff -r b29219389b00 -r e5d769afd3ef templates/changelogentry.tmpl
diff -r b29219389b00 -r e5d769afd3ef templates/changeset.tmpl
diff -r b29219389b00 -r e5d769afd3ef templates/fileannotate.tmpl
diff -r b29219389b00 -r e5d769afd3ef templates/filediff.tmpl
diff -r b29219389b00 -r e5d769afd3ef templates/filelogentry.tmpl
diff -r b29219389b00 -r e5d769afd3ef templates/filerevision.tmpl
diff -r b29219389b00 -r e5d769afd3ef templates/manifest.tmpl
diff -r b29219389b00 -r e5d769afd3ef templates/map
diff -r b29219389b00 -r e5d769afd3ef tests/test-conflict.out
diff -r b29219389b00 -r e5d769afd3ef tests/test-tags.out
diff -r b29219389b00 -r e5d769afd3ef tests/test-up-local-change.out