Show More
@@ -137,6 +137,10 b' def submerge(repo, wctx, mctx, actx, ove' | |||||
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' |
General Comments 0
You need to be logged in to leave comments.
Login now