Show More
@@ -28,6 +28,12 b' from mercurial.i18n import _' | |||||
28 |
|
28 | |||
29 | class CantReprocessAndShowBase(Exception): |
|
29 | class CantReprocessAndShowBase(Exception): | |
30 | pass |
|
30 | pass | |
|
31 | ||||
|
32 | ||||
|
33 | def warn(message): | |||
|
34 | sys.stdout.flush() | |||
|
35 | sys.stderr.write(message) | |||
|
36 | sys.stderr.flush() | |||
31 |
|
37 | |||
32 |
|
38 | |||
33 | def intersect(ra, rb): |
|
39 | def intersect(ra, rb): | |
@@ -453,7 +459,7 b' def simplemerge(local, base, other, **op' | |||||
453 | if not opts.get('text'): |
|
459 | if not opts.get('text'): | |
454 | raise util.Abort(msg) |
|
460 | raise util.Abort(msg) | |
455 | elif not opts.get('quiet'): |
|
461 | elif not opts.get('quiet'): | |
456 |
|
|
462 | warn(_('warning: %s\n') % msg) | |
457 | return text |
|
463 | return text | |
458 |
|
464 | |||
459 | name_a = local |
|
465 | name_a = local | |
@@ -490,8 +496,7 b' def simplemerge(local, base, other, **op' | |||||
490 |
|
496 | |||
491 | if m3.conflicts: |
|
497 | if m3.conflicts: | |
492 | if not opts.get('quiet'): |
|
498 | if not opts.get('quiet'): | |
493 | sys.stdout.flush() |
|
499 | warn(_("warning: conflicts during merge.\n")) | |
494 | sys.stderr.write(_("warning: conflicts during merge.\n")) |
|
|||
495 | return 1 |
|
500 | return 1 | |
496 |
|
501 | |||
497 | options = [('L', 'label', [], _('labels to use on conflict markers')), |
|
502 | options = [('L', 'label', [], _('labels to use on conflict markers')), |
General Comments 0
You need to be logged in to leave comments.
Login now