Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/manifest.py @ 3148:adb246ce6736

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix newline in error message
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 22 Sep 2006 18:29:04 +0200
parents 1eb50c9d2649
children f3b939444c72
comparison
equal deleted inserted replaced
3147:97420a49188d 3148:adb246ce6736
167 else: 167 else:
168 l = "" 168 l = ""
169 if start == end and w[1] == 1: 169 if start == end and w[1] == 1:
170 # item we want to delete was not found, error out 170 # item we want to delete was not found, error out
171 raise AssertionError( 171 raise AssertionError(
172 _("failed to remove %s from manifest\n") % f) 172 _("failed to remove %s from manifest") % f)
173 if dstart != None and dstart <= start and dend >= start: 173 if dstart != None and dstart <= start and dend >= start:
174 if dend < end: 174 if dend < end:
175 dend = end 175 dend = end
176 if l: 176 if l:
177 dline.append(l) 177 dline.append(l)