--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -424,6 +424,7 @@ class localrepository(object):
changed.append(f)
# update manifest
+ m1 = m1.copy()
m1.update(new)
for f in remove:
if f in m1:
@@ -1389,7 +1390,7 @@ class localrepository(object):
man = self.manifest.ancestor(m1n, m2n)
m1 = self.manifest.read(m1n)
mf1 = self.manifest.readflags(m1n)
- m2 = self.manifest.read(m2n)
+ m2 = self.manifest.read(m2n).copy()
mf2 = self.manifest.readflags(m2n)
ma = self.manifest.read(man)
mfa = self.manifest.readflags(man)
--- a/templates/header.tmpl
+++ b/templates/header.tmpl
@@ -3,6 +3,7 @@ Content-type: text/html
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
+<meta name="robots" content="index, nofollow" />
<style type="text/css">
<!--
a { text-decoration:none; }