Mercurial > hg-stable
comparison tests/test-mq-qpush-exact.t @ 24365:f1eaf03dd608
commands: say "working directory" in full spelling
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Tue, 17 Mar 2015 21:53:17 +0900 |
| parents | aa9385f983fa |
| children | bbf544b5f2e9 |
comparison
equal
deleted
inserted
replaced
| 24364:135b23868f45 | 24365:f1eaf03dd608 |
|---|---|
| 201 $ hg qpush -ef | 201 $ hg qpush -ef |
| 202 applying p0 | 202 applying p0 |
| 203 file fp0 already exists | 203 file fp0 already exists |
| 204 1 out of 1 hunks FAILED -- saving rejects to file fp0.rej | 204 1 out of 1 hunks FAILED -- saving rejects to file fp0.rej |
| 205 patch failed, unable to continue (try -v) | 205 patch failed, unable to continue (try -v) |
| 206 patch failed, rejects left in working dir | 206 patch failed, rejects left in working directory |
| 207 errors during apply, please fix and refresh p0 | 207 errors during apply, please fix and refresh p0 |
| 208 [2] | 208 [2] |
| 209 $ cat fp0 | 209 $ cat fp0 |
| 210 cp0-bad | 210 cp0-bad |
| 211 $ cat fp0.rej | 211 $ cat fp0.rej |
| 228 applying p0 | 228 applying p0 |
| 229 applying p1 | 229 applying p1 |
| 230 file fp1 already exists | 230 file fp1 already exists |
| 231 1 out of 1 hunks FAILED -- saving rejects to file fp1.rej | 231 1 out of 1 hunks FAILED -- saving rejects to file fp1.rej |
| 232 patch failed, unable to continue (try -v) | 232 patch failed, unable to continue (try -v) |
| 233 patch failed, rejects left in working dir | 233 patch failed, rejects left in working directory |
| 234 errors during apply, please fix and refresh p1 | 234 errors during apply, please fix and refresh p1 |
| 235 [2] | 235 [2] |
| 236 $ cat fp1 | 236 $ cat fp1 |
| 237 cp1-bad | 237 cp1-bad |
| 238 $ cat fp1.rej | 238 $ cat fp1.rej |