Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
authorMatt Mackall <mpm@selenic.com>
Tue, 24 Jan 2006 13:49:20 +1300
changeset 1631 4fb25c078d06
parent 1628 88ad18c16ae5 (current diff)
parent 1629 3024cacfb2c9 (diff)
child 1632 3f214984fd9e
Merge with crew
--- 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)
Mercurial