equal
deleted
inserted
replaced
485 expected.setdefault(pos, []).append(l[2:]) |
485 expected.setdefault(pos, []).append(l[2:]) |
486 else: |
486 else: |
487 # non-command/result - queue up for merged output |
487 # non-command/result - queue up for merged output |
488 after.setdefault(pos, []).append(l) |
488 after.setdefault(pos, []).append(l) |
489 |
489 |
|
490 if script and not script[-1].endswith('\n'): |
|
491 script[-1] = script[-1] + '\n' |
490 script.append('echo %s %s $?\n' % (salt, n + 1)) |
492 script.append('echo %s %s $?\n' % (salt, n + 1)) |
491 |
493 |
492 fd, name = tempfile.mkstemp(suffix='hg-tst') |
494 fd, name = tempfile.mkstemp(suffix='hg-tst') |
493 |
495 |
494 try: |
496 try: |