Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 14417:25137d99a5ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: handle local added subrepo case correctly
author Matt Mackall <mpm@selenic.com>
date Mon, 23 May 2011 22:49:10 -0500
parents d5b525697ddb
children 96f1c1b14154
comparison
equal deleted inserted replaced
14416:253bda94372e 14417:25137d99a5ed
135 wctx.sub(s).merge(r) 135 wctx.sub(s).merge(r)
136 sm[s] = l 136 sm[s] = l
137 elif ld == a: # remote removed, local unchanged 137 elif ld == a: # remote removed, local unchanged
138 debug(s, "remote removed, remove") 138 debug(s, "remote removed, remove")
139 wctx.sub(s).remove() 139 wctx.sub(s).remove()
140 elif a == nullstate: # not present in remote or ancestor
141 debug(s, "local added, keep")
142 sm[s] = l
143 continue
140 else: 144 else:
141 if repo.ui.promptchoice( 145 if repo.ui.promptchoice(
142 _(' local changed subrepository %s which remote removed\n' 146 _(' local changed subrepository %s which remote removed\n'
143 'use (c)hanged version or (d)elete?') % s, 147 'use (c)hanged version or (d)elete?') % s,
144 (_('&Changed'), _('&Delete')), 0): 148 (_('&Changed'), _('&Delete')), 0):