Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
memctx: add note about p2
authorSean Farley <sean.michael.farley@gmail.com>
Tue, 17 Jun 2014 20:55:06 -0700
changeset 22075 2f0358275501
parent 22074 fbe967b027bd
child 22076 e59b5e5918a5
memctx: add note about p2
mercurial/context.py file | annotate | diff | comparison | revisions 
--- a/mercurial/context.py	Fri Jul 25 20:20:26 2014 -0500
+++ b/mercurial/context.py	Tue Jun 17 20:55:06 2014 -0700
@@ -1645,7 +1645,7 @@
         for f, fnode in man.iteritems():
             p1node = nullid
             p2node = nullid
-            p = pctx[f].parents()
+            p = pctx[f].parents() # if file isn't in pctx, check p2?
             if len(p) > 0:
                 p1node = p[0].node()
                 if len(p) > 1:
Mercurial