facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity

Merge with crew

Browse Source
This commit is contained in:
Matt Mackall 2006-01-24 13:49:20 +13:00
commit f822ba591d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mercurial/localrepo.py
View File

@ -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)