203 debug(s, "other side changed, get", r) |
203 debug(s, "other side changed, get", r) |
204 wctx.sub(s).get(r, overwrite) |
204 wctx.sub(s).get(r, overwrite) |
205 sm[s] = r |
205 sm[s] = r |
206 else: |
206 else: |
207 debug(s, "both sides changed") |
207 debug(s, "both sides changed") |
|
208 srepo = wctx.sub(s) |
208 option = repo.ui.promptchoice( |
209 option = repo.ui.promptchoice( |
209 _(' subrepository %s diverged (local revision: %s, ' |
210 _(' subrepository %s diverged (local revision: %s, ' |
210 'remote revision: %s)\n' |
211 'remote revision: %s)\n' |
211 '(M)erge, keep (l)ocal or keep (r)emote?' |
212 '(M)erge, keep (l)ocal or keep (r)emote?' |
212 '$$ &Merge $$ &Local $$ &Remote') |
213 '$$ &Merge $$ &Local $$ &Remote') |
213 % (s, l[1][:12], r[1][:12]), 0) |
214 % (s, srepo.shortid(l[1]), srepo.shortid(r[1])), 0) |
214 if option == 0: |
215 if option == 0: |
215 wctx.sub(s).merge(r) |
216 wctx.sub(s).merge(r) |
216 sm[s] = l |
217 sm[s] = l |
217 debug(s, "merge with", r) |
218 debug(s, "merge with", r) |
218 elif option == 1: |
219 elif option == 1: |