# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1137952465 -3600
# Node ID 3024cacfb2c96ab04b07cbad6074a12771605d77
# Parent  11cd38286fdbd87402a16058c1d8b1afc5636bbe
Copy manifest map before modifying it (see issue86)


diff -r 11cd38286fdb -r 3024cacfb2c9 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Wed Jan 18 17:07:48 2006 +0100
+++ b/mercurial/localrepo.py	Sun Jan 22 18:54:25 2006 +0100
@@ -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)