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