Mercurial > hg

changeset 1629:3024cacfb2c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Copy manifest map before modifying it (see issue86)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 22 Jan 2006 18:54:25 +0100
parents 11cd38286fdb
children 4fb25c078d06
files mercurial/localrepo.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)