Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.py @ 24148:7a2194473155

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 27 Feb 2015 17:46:03 -0600
parents 27b6d41aa029 756c5c8331b0
children 2cc8ee4c4e1c
line wrap: on
line diff
--- a/mercurial/subrepo.py	Tue Feb 24 09:08:54 2015 -0800
+++ b/mercurial/subrepo.py	Fri Feb 27 17:46:03 2015 -0600
@@ -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