Show More
@@ -49,6 +49,17 b' nomerge = None' | |||||
49 | mergeonly = 'mergeonly' # just the full merge, no premerge |
|
49 | mergeonly = 'mergeonly' # just the full merge, no premerge | |
50 | fullmerge = 'fullmerge' # both premerge and merge |
|
50 | fullmerge = 'fullmerge' # both premerge and merge | |
51 |
|
51 | |||
|
52 | _localchangedotherdeletedmsg = _( | |||
|
53 | "local%(l)s changed %(fd)s which other%(o)s deleted\n" | |||
|
54 | "use (c)hanged version, (d)elete, or leave (u)nresolved?" | |||
|
55 | "$$ &Changed $$ &Delete $$ &Unresolved") | |||
|
56 | ||||
|
57 | _otherchangedlocaldeletedmsg = _( | |||
|
58 | "other%(o)s changed %(fd)s which local%(l)s deleted\n" | |||
|
59 | "use (c)hanged version, leave (d)eleted, or " | |||
|
60 | "leave (u)nresolved?" | |||
|
61 | "$$ &Changed $$ &Deleted $$ &Unresolved") | |||
|
62 | ||||
52 | class absentfilectx(object): |
|
63 | class absentfilectx(object): | |
53 | """Represents a file that's ostensibly in a context but is actually not |
|
64 | """Represents a file that's ostensibly in a context but is actually not | |
54 | present in it. |
|
65 | present in it. | |
@@ -250,16 +261,11 b' def _iprompt(repo, mynode, orig, fcd, fc' | |||||
250 | try: |
|
261 | try: | |
251 | if fco.isabsent(): |
|
262 | if fco.isabsent(): | |
252 | index = ui.promptchoice( |
|
263 | index = ui.promptchoice( | |
253 |
_ |
|
264 | _localchangedotherdeletedmsg % prompts, 2) | |
254 | "use (c)hanged version, (d)elete, or leave (u)nresolved?" |
|
|||
255 | "$$ &Changed $$ &Delete $$ &Unresolved") % prompts, 2) |
|
|||
256 | choice = ['local', 'other', 'unresolved'][index] |
|
265 | choice = ['local', 'other', 'unresolved'][index] | |
257 | elif fcd.isabsent(): |
|
266 | elif fcd.isabsent(): | |
258 | index = ui.promptchoice( |
|
267 | index = ui.promptchoice( | |
259 |
_ |
|
268 | _otherchangedlocaldeletedmsg % prompts, 2) | |
260 | "use (c)hanged version, leave (d)eleted, or " |
|
|||
261 | "leave (u)nresolved?" |
|
|||
262 | "$$ &Changed $$ &Deleted $$ &Unresolved") % prompts, 2) |
|
|||
263 | choice = ['other', 'local', 'unresolved'][index] |
|
269 | choice = ['other', 'local', 'unresolved'][index] | |
264 | else: |
|
270 | else: | |
265 | index = ui.promptchoice( |
|
271 | index = ui.promptchoice( |
General Comments 0
You need to be logged in to leave comments.
Login now