Show More
@@ -470,6 +470,8 b' Supported arguments:' | |||||
470 | Ask whether merge was successful when the merged file shows no changes. |
|
470 | Ask whether merge was successful when the merged file shows no changes. | |
471 | ``conflicts`` |
|
471 | ``conflicts`` | |
472 | Check whether there are conflicts even though the tool reported success. |
|
472 | Check whether there are conflicts even though the tool reported success. | |
|
473 | ``prompt`` | |||
|
474 | Always prompt for merge success, regardless of success reported by tool. | |||
473 |
|
475 | |||
474 | ``checkchanged`` |
|
476 | ``checkchanged`` | |
475 | True is equivalent to ``check = changed``. |
|
477 | True is equivalent to ``check = changed``. |
@@ -231,8 +231,15 b' def filemerge(repo, mynode, orig, fcd, f' | |||||
231 | if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data()): |
|
231 | if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data()): | |
232 | r = 1 |
|
232 | r = 1 | |
233 |
|
233 | |||
234 | if not r and (_toolbool(ui, tool, "checkchanged") or |
|
234 | checked = False | |
235 |
|
|
235 | if 'prompt' in _toollist(ui, tool, "check"): | |
|
236 | checked = True | |||
|
237 | if ui.promptchoice(_("was merge of '%s' successful (yn)?") % fd, | |||
|
238 | (_("&Yes"), _("&No")), 1): | |||
|
239 | r = 1 | |||
|
240 | ||||
|
241 | if not r and not checked and (_toolbool(ui, tool, "checkchanged") or | |||
|
242 | 'changed' in _toollist(ui, tool, "check")): | |||
236 | if filecmp.cmp(repo.wjoin(fd), back): |
|
243 | if filecmp.cmp(repo.wjoin(fd), back): | |
237 | if ui.promptchoice(_(" output file %s appears unchanged\n" |
|
244 | if ui.promptchoice(_(" output file %s appears unchanged\n" | |
238 | "was merge successful (yn)?") % fd, |
|
245 | "was merge successful (yn)?") % fd, |
General Comments 0
You need to be logged in to leave comments.
Login now