Mercurial > hg

changeset 187:aa9a0d50e612

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix two minor merge bugs -----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-----
author mpm@selenic.com
date Sat, 28 May 2005 13:59:09 -0800
parents 9a2075c0b9b8
children f40273b0ad7b
files mercurial/hg.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Sat May 28 13:31:49 2005 -0800
+++ b/mercurial/hg.py	Sat May 28 13:59:09 2005 -0800
@@ -769,7 +769,7 @@
         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 @@
     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):