Mercurial > hg
comparison tests/test-transplant.out @ 9995:eba6c8687fd2 stable
transplant: fix small bug when a patch fails while using --filter
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Thu, 03 Dec 2009 11:06:44 +0100 |
parents | a3d73b3e1f8a |
children | a4fbbe0fbc38 |
comparison
equal
deleted
inserted
replaced
9993:8bce1e0d2801 | 9995:eba6c8687fd2 |
---|---|
157 a53251cdf717 transplanted to 14f8512272b5 | 157 a53251cdf717 transplanted to 14f8512272b5 |
158 3 b3 | 158 3 b3 |
159 2 b2 | 159 2 b2 |
160 1 b1 | 160 1 b1 |
161 0 r2 | 161 0 r2 |
162 % test filter with failed patch | |
163 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
164 adding b1 | |
165 adding test-filter | |
166 created new head | |
167 file b1 already exists | |
168 1 out of 1 hunks FAILED -- saving rejects to file b1.rej | |
169 abort: Fix up the merge and run hg transplant --continue | |
170 filtering | |
171 applying 348b36d0b6a5 | |
172 patch failed to apply | |
162 % test with a win32ext like setup (differing EOLs) | 173 % test with a win32ext like setup (differing EOLs) |
163 adding a | 174 adding a |
164 adding b | 175 adding b |
165 nothing changed | 176 nothing changed |
166 applying 2e849d776c17 | 177 applying 2e849d776c17 |