Mercurial > hg
changeset 13790:c0ed76b5056d
Fix transplant error message to correspond with test
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Mon, 28 Mar 2011 21:36:29 -0700 |
| parents | 7e5031180c0f |
| children | a916e8de4313 |
| files | hgext/transplant.py tests/test-transplant.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/transplant.py Mon Mar 28 21:17:32 2011 +0100 +++ b/hgext/transplant.py Mon Mar 28 21:36:29 2011 -0700 @@ -363,7 +363,7 @@ inmsg = True message.append(line) if None in (user, date): - raise util.Abort(_("filter produced garbled log file")) + raise util.Abort(_("filter corrupted changeset (no user or date)")) return (node, user, date, '\n'.join(message), parents) def log(self, user, date, message, p1, p2, merge=False):
--- a/tests/test-transplant.t Mon Mar 28 21:17:32 2011 +0100 +++ b/tests/test-transplant.t Mon Mar 28 21:36:29 2011 -0700 @@ -374,7 +374,7 @@ $ chmod +x test-filter-invalid-log $ hg transplant -s ../t --filter ./test-filter-invalid-log 0 filtering * (glob) - abort: filter failed + abort: filter corrupted changeset (no user or date) [255] test with a win32ext like setup (differing EOLs)