mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
Merge with crew
This commit is contained in:
commit
f822ba591d
@ -424,6 +424,7 @@ class localrepository(object):
|
|||||||
changed.append(f)
|
changed.append(f)
|
||||||
|
|
||||||
# update manifest
|
# update manifest
|
||||||
|
m1 = m1.copy()
|
||||||
m1.update(new)
|
m1.update(new)
|
||||||
for f in remove:
|
for f in remove:
|
||||||
if f in m1:
|
if f in m1:
|
||||||
@ -1385,7 +1386,7 @@ class localrepository(object):
|
|||||||
man = self.manifest.ancestor(m1n, m2n)
|
man = self.manifest.ancestor(m1n, m2n)
|
||||||
m1 = self.manifest.read(m1n)
|
m1 = self.manifest.read(m1n)
|
||||||
mf1 = self.manifest.readflags(m1n)
|
mf1 = self.manifest.readflags(m1n)
|
||||||
m2 = self.manifest.read(m2n)
|
m2 = self.manifest.read(m2n).copy()
|
||||||
mf2 = self.manifest.readflags(m2n)
|
mf2 = self.manifest.readflags(m2n)
|
||||||
ma = self.manifest.read(man)
|
ma = self.manifest.read(man)
|
||||||
mfa = self.manifest.readflags(man)
|
mfa = self.manifest.readflags(man)
|
||||||
|
Loading…
Reference in New Issue
Block a user