diff -r 31bedb15e2e5 -r 756c5c8331b0 mercurial/subrepo.py
--- a/mercurial/subrepo.py	Thu Feb 12 10:38:33 2015 +0800
+++ b/mercurial/subrepo.py	Tue Feb 17 23:20:55 2015 -0800
@@ -245,7 +245,7 @@
                   'use (c)hanged version or (d)elete?'
                   '$$ &Changed $$ &Delete') % s, 0) == 0:
                 debug(s, "prompt recreate", r)
-                wctx.sub(s).get(r)
+                mctx.sub(s).get(r)
                 sm[s] = r
 
     # record merged .hgsubstate