[PATCH] subrepo: move prompts out of the if (issue5505)

[Yuya Nishihara]

On Fri, 17 Mar 2017 13:18:35 -0700, Simon Farnsworth wrote:
> On 17/03/2017 13:10, Simon Farnsworth wrote:
> <snip>
> > diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
> > --- a/tests/test-subrepo.t
> > +++ b/tests/test-subrepo.t
> > @@ -349,7 +349,7 @@
> >  local removed, remote changed, keep changed
> >
> >    $ hg merge 6
> > -   remote [merge rev] changed subrepository s which local [working copy] removed
> > +   remote [merge rev] changed subrepository t which local [working copy] removed
> These change because for some reason, the subrepo prompted for was wrong 
> before. I'm not clear on why the code motion affected this, and this 
> should motivate extra review from someone who's interested in subrepo 
> support.

Perhaps the remote repo name (s of s2.items()) wasn't set before and
old prompts['s'] would be used instead.

Can you rebase this to stable branch and make V2 per foozy's comment?