Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
24147:ba4fcd80079d 24148:7a2194473155
243 if repo.ui.promptchoice( 243 if repo.ui.promptchoice(
244 _(' remote changed subrepository %s which local removed\n' 244 _(' remote changed subrepository %s which local removed\n'
245 'use (c)hanged version or (d)elete?' 245 'use (c)hanged version or (d)elete?'
246 '$$ &Changed $$ &Delete') % s, 0) == 0: 246 '$$ &Changed $$ &Delete') % s, 0) == 0:
247 debug(s, "prompt recreate", r) 247 debug(s, "prompt recreate", r)
248 wctx.sub(s).get(r) 248 mctx.sub(s).get(r)
249 sm[s] = r 249 sm[s] = r
250 250
251 # record merged .hgsubstate 251 # record merged .hgsubstate
252 writestate(repo, sm) 252 writestate(repo, sm)
253 return sm 253 return sm