Mercurial > public > mercurial-scm > hg
diff mercurial/hg.py @ 725:c6b912f8b5b2
Merge with Matt's tip.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 19 Jul 2005 07:00:03 -0800 |
parents | 1c0c413cccdd 7c385bd5f993 |
children | 809a870a0e73 |
line wrap: on
line diff
--- a/mercurial/hg.py Mon Jul 18 06:54:21 2005 -0800 +++ b/mercurial/hg.py Tue Jul 19 07:00:03 2005 -0800 @@ -216,7 +216,8 @@ # item not found, insert a new one end = bs if w[1] == 1: - sys.stderr.write("failed to remove %s from manifest" % f) + sys.stderr.write("failed to remove %s from manifest\n" + % f) sys.exit(1) else: # item is found, replace/delete the existing line @@ -231,7 +232,7 @@ text = "".join(self.addlist) if cachedelta and mdiff.patch(self.listcache[0], cachedelta) != text: - sys.stderr.write("manifest delta failure") + sys.stderr.write("manifest delta failure\n") sys.exit(1) n = self.addrevision(text, transaction, link, p1, p2, cachedelta) self.mapcache = (n, map, flags)