--- a/tests/test-import.out
+++ b/tests/test-import.out
@@ -8,7 +8,6 @@ adding file changes
added 1 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../tip.patch
-patching file a
% message should be same
summary: second change
% committer should be same
@@ -21,7 +20,6 @@ adding file changes
added 1 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../tip.patch
-patching file a
transaction abort!
rollback completed
% import of plain diff should be ok with message
@@ -32,7 +30,6 @@ adding file changes
added 1 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../tip.patch
-patching file a
% import from stdin
requesting all changes
adding changesets
@@ -41,7 +38,6 @@ adding file changes
added 1 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
-patching file a
% override commit message
requesting all changes
adding changesets
@@ -50,7 +46,6 @@ adding file changes
added 1 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
-patching file a
summary: override
% plain diff in email, subject, message body
requesting all changes
@@ -60,7 +55,6 @@ adding file changes
added 1 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../msg.patch
-patching file a
user: email patcher
summary: email patch
% plain diff in email, no subject, message body
@@ -71,7 +65,6 @@ adding file changes
added 1 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
-patching file a
% plain diff in email, subject, no message body
requesting all changes
adding changesets
@@ -80,7 +73,6 @@ adding file changes
added 1 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
-patching file a
% plain diff in email, no subject, no message body, should fail
requesting all changes
adding changesets
@@ -89,7 +81,6 @@ adding file changes
added 1 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
-patching file a
transaction abort!
rollback completed
% hg export in email, should use patch header
@@ -100,7 +91,6 @@ adding file changes
added 1 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying patch from stdin
-patching file a
summary: second change
% hg import in a subdirectory
requesting all changes
@@ -110,7 +100,6 @@ adding file changes
added 1 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../../../tip.patch
-patching file a
% message should be 'subdir change'
summary: subdir change
% committer should be 'someoneelse'