##// END OF EJS Templates
Fix transplant error message to correspond with test
Brendan Cully -
r13790:c0ed76b5 default
parent child Browse files
Show More
@@ -363,7 +363,7 b' class transplanter(object):'
363 inmsg = True
363 inmsg = True
364 message.append(line)
364 message.append(line)
365 if None in (user, date):
365 if None in (user, date):
366 raise util.Abort(_("filter produced garbled log file"))
366 raise util.Abort(_("filter corrupted changeset (no user or date)"))
367 return (node, user, date, '\n'.join(message), parents)
367 return (node, user, date, '\n'.join(message), parents)
368
368
369 def log(self, user, date, message, p1, p2, merge=False):
369 def log(self, user, date, message, p1, p2, merge=False):
@@ -374,7 +374,7 b' test transplant with filter handles inva'
374 $ chmod +x test-filter-invalid-log
374 $ chmod +x test-filter-invalid-log
375 $ hg transplant -s ../t --filter ./test-filter-invalid-log 0
375 $ hg transplant -s ../t --filter ./test-filter-invalid-log 0
376 filtering * (glob)
376 filtering * (glob)
377 abort: filter failed
377 abort: filter corrupted changeset (no user or date)
378 [255]
378 [255]
379
379
380 test with a win32ext like setup (differing EOLs)
380 test with a win32ext like setup (differing EOLs)
General Comments 0
You need to be logged in to leave comments. Login now