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

Fix two minor merge bugs

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

Fix two minor merge bugs

Fix variable name for printing manifest node
Trouble with empty between lists from remote repos

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

iD8DBQFCmOmtywK+sNU5EO8RAs7AAJ9dVyOn5Ne+EopdUqOe8IKVH86R3wCfUhNO
CLpuRURCB5Ang19YZ5MLGeg=
=NF1T
-----END PGP SIGNATURE-----
This commit is contained in:
mpm@selenic.com 2005-05-28 13:59:09 -08:00
parent 68acd15143
commit 0c92a53dcc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/hg.py
View File

@ -769,7 +769,7 @@ class localrepository:
if co == cn: cn = -1
edittext = "\nHG: merge resolve\n" + \
"HG: manifest hash %s\n" % hex(mnode) + \
"HG: manifest hash %s\n" % hex(node) + \
"".join(["HG: changed %s\n" % f for f in new])
edittext = self.ui.edit(edittext)
n = self.changelog.add(node, new, edittext, tr, co, cn)
@ -834,7 +834,7 @@ class remoterepository:
def between(self, pairs):
n = "\n".join(["-".join(map(hex, p)) for p in pairs])
d = self.do_cmd("between", pairs=n).read()
p = [ map(bin, l.split(" ")) for l in d.splitlines() ]
p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ]
return p
def changegroup(self, nodes):