110 applying a1e30dd1b8e7 |
110 applying a1e30dd1b8e7 |
111 patching file foo |
111 patching file foo |
112 Hunk #1 FAILED at 0 |
112 Hunk #1 FAILED at 0 |
113 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
113 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
114 patch failed to apply |
114 patch failed to apply |
115 abort: Fix up the merge and run hg transplant --continue |
115 abort: fix up the merge and run hg transplant --continue |
116 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
116 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
117 applying a1e30dd1b8e7 |
117 applying a1e30dd1b8e7 |
118 patching file foo |
118 patching file foo |
119 Hunk #1 FAILED at 0 |
119 Hunk #1 FAILED at 0 |
120 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
120 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
121 patch failed to apply |
121 patch failed to apply |
122 abort: Fix up the merge and run hg transplant --continue |
122 abort: fix up the merge and run hg transplant --continue |
123 a1e30dd1b8e7 transplanted as f1563cf27039 |
123 a1e30dd1b8e7 transplanted as f1563cf27039 |
124 skipping already applied revision 1:a1e30dd1b8e7 |
124 skipping already applied revision 1:a1e30dd1b8e7 |
125 applying 1739ac5f6139 |
125 applying 1739ac5f6139 |
126 1739ac5f6139 transplanted to d649c221319f |
126 1739ac5f6139 transplanted to d649c221319f |
127 applying 0282d5fbbe02 |
127 applying 0282d5fbbe02 |
164 adding b1 |
164 adding b1 |
165 adding test-filter |
165 adding test-filter |
166 created new head |
166 created new head |
167 file b1 already exists |
167 file b1 already exists |
168 1 out of 1 hunks FAILED -- saving rejects to file b1.rej |
168 1 out of 1 hunks FAILED -- saving rejects to file b1.rej |
169 abort: Fix up the merge and run hg transplant --continue |
169 abort: fix up the merge and run hg transplant --continue |
170 filtering |
170 filtering |
171 applying 348b36d0b6a5 |
171 applying 348b36d0b6a5 |
172 patch failed to apply |
172 patch failed to apply |
173 % test with a win32ext like setup (differing EOLs) |
173 % test with a win32ext like setup (differing EOLs) |
174 adding a |
174 adding a |