Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.py @ 24110:756c5c8331b0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: add tests for change/remove conflicts There are currently no tests for change/remove conflicts of subrepos, and it's pretty broken. Add some tests demonstrating some of the breakages and fix the most obvious one (a KeyError when trying to look up a subrepo in the wrong context).
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 17 Feb 2015 23:20:55 -0800
parents 8f02682ff3b0
children 7a2194473155
line wrap: on
line diff
--- 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