# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1138063760 -46800
# Node ID 4fb25c078d06bdbede7c2417fb59ee500f5d74dc
# Parent  88ad18c16ae5756f03e6f23b7f8569abe74fc6eb# Parent  3024cacfb2c96ab04b07cbad6074a12771605d77
Merge with crew



diff -r 88ad18c16ae5 -r 4fb25c078d06 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Mon Jan 23 16:36:44 2006 +1300
+++ b/mercurial/localrepo.py	Tue Jan 24 13:49:20 2006 +1300
@@ -424,6 +424,7 @@
             changed.append(f)
 
         # update manifest
+        m1 = m1.copy()
         m1.update(new)
         for f in remove:
             if f in m1:
@@ -1385,7 +1386,7 @@
         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)