# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1403063706 25200
# Node ID 2f0358275501360d2e158bf9c18b8c08db461ddf
# Parent  fbe967b027bd49544c74524fe8bec4e34c7c3c25
memctx: add note about p2

diff -r fbe967b027bd -r 2f0358275501 mercurial/context.py
--- 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: