equal
deleted
inserted
replaced
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 |