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

More tweaking to rawcommit for repo conversion

Browse Source 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

More tweaking to rawcommit for repo conversion

manifest hash: 912e7d61fc15845fd24baada9f553c2d38b26f06
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCrGdBywK+sNU5EO8RApbrAKCPVvxnSgkzAWpwc6uRDCCYAsqO7QCeMonn
tZS4URbMI2aDQYw15wDEZHg=
=C2Vn
-----END PGP SIGNATURE-----
This commit is contained in:
mpm@selenic.com 2005-06-12 08:48:01 -08:00
parent 9e30d45970
commit b077acf769
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mercurial/hg.py
View File

@ -439,6 +439,7 @@ class localrepository:
mm = m1.copy()
mfm = mf1.copy()
linkrev = self.changelog.count()
self.dirstate.setparents(p1, p2)
for f in files:
try:
t = self.wfile(f).read()
@ -447,16 +448,19 @@ class localrepository:
mfm[f] = tm
mm[f] = r.add(t, tr, linkrev,
m1.get(f, nullid), m2.get(f, nullid))
self.dirstate.update([f], "n")
except IOError:
del mm[f]
del mfm[f]
try:
del mm[f]
del mfm[f]
self.dirstate.forget([f])
except:
# deleted from p2?
pass
mnode = self.manifest.add(mm, mfm, tr, linkrev, c1[0], c2[0])
n = self.changelog.add(mnode, files, text, tr, p1, p2, user, date)
tr.close()
self.dirstate.setparents(p1, p2)
self.dirstate.clear()
self.dirstate.update(files, "n")
def commit(self, files = None, text = ""):
commit = []