From 87df0f7aed2d51142b5661f75aed324762dcdfb8 Mon Sep 17 00:00:00 2001 From: Thomas Arendsen Hein Date: Sun, 22 Jan 2006 18:54:25 +0100 Subject: [PATCH] Copy manifest map before modifying it (see issue86) --- mercurial/localrepo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py index f2f8925637..5a8ea189d2 100644 --- 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: @@ -1385,7 +1386,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)