Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/subrepo.py
changeset 24148 7a2194473155
parent 24135 27b6d41aa029
parent 24110 756c5c8331b0
child 24173 2cc8ee4c4e1c 
--- 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
mercurial