Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-mq.out @ 4901:27414950abf5
Update test output to reflect small changes in patch chattiness.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 17 Jul 2007 09:39:30 -0700 |
parents | bbdcacf7cef8 |
children | 8535c1770dd3 48ebd6a83994 |
comparison
equal
deleted
inserted
replaced
4900:e56c7e05c7e6 | 4901:27414950abf5 |
---|---|
260 M a | 260 M a |
261 % qpush failure | 261 % qpush failure |
262 Patch queue now empty | 262 Patch queue now empty |
263 applying foo | 263 applying foo |
264 applying bar | 264 applying bar |
265 1 out of 1 hunk ignored -- saving rejects to file foo.rej | 265 file foo already exists |
266 1 out of 1 hunk FAILED -- saving rejects to file foo.rej | |
266 patch failed, unable to continue (try -v) | 267 patch failed, unable to continue (try -v) |
267 patch failed, rejects left in working dir | 268 patch failed, rejects left in working dir |
268 Errors during apply, please fix and refresh bar | 269 Errors during apply, please fix and refresh bar |
269 ? foo | 270 ? foo |
270 ? foo.rej | 271 ? foo.rej |