Mercurial > public > mercurial-scm > hg-stable

diff mercurial/context.py @ 22075:2f0358275501

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
memctx: add note about p2
author Sean Farley <sean.michael.farley@gmail.com>
date Tue, 17 Jun 2014 20:55:06 -0700
parents fbe967b027bd
children 9f9a2b79dcd7
line wrap: on
line diff
--- 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: