diff --git a/tests/test-transplant.out b/tests/test-transplant.out --- a/tests/test-transplant.out +++ b/tests/test-transplant.out @@ -88,11 +88,19 @@ Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file foo.rej patch command failed: exited with status 1 abort: Fix up the merge and run hg transplant --continue -a1e30dd1b8e7 transplanted as e6d0b5145568 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +applying a1e30dd1b8e7 +foo +Hunk #1 FAILED at 1. +1 out of 1 hunk FAILED -- saving rejects to file foo.rej +patch command failed: exited with status 1 +abort: Fix up the merge and run hg transplant --continue +a1e30dd1b8e7 transplanted as f1563cf27039 +skipping already applied revision 1:a1e30dd1b8e7 applying 1739ac5f6139 -1739ac5f6139 transplanted to 48f780141a79 +1739ac5f6139 transplanted to d649c221319f applying 0282d5fbbe02 -0282d5fbbe02 transplanted to 821d17b1a3ed +0282d5fbbe02 transplanted to 77418277ccb3 added bar foo