Mercurial > hg
comparison tests/test-mq-qpush-fail.t @ 23749:a387b0390082
localrepo: show headline notes in commitctx before showing filenames
commitctx already showed notes with filenames but didn't provide any context.
It is just as relevant to know when manifest or changelog is committed.
So, in addition to filenames, also show headlines 'committing files:',
'committing manifest' and 'committing changelog'.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 18 Apr 2014 13:33:20 +0200 |
| parents | c63a09b6b337 |
| children | f1eaf03dd608 |
comparison
equal
deleted
inserted
replaced
| 23748:4ab66de46a96 | 23749:a387b0390082 |
|---|---|
| 262 $ echo e1 > e | 262 $ echo e1 > e |
| 263 $ hg qpush -a --force --verbose | 263 $ hg qpush -a --force --verbose |
| 264 applying p2 | 264 applying p2 |
| 265 saving current version of a as a.orig | 265 saving current version of a as a.orig |
| 266 patching file a | 266 patching file a |
| 267 a | 267 committing files: |
| 268 a | |
| 269 committing manifest | |
| 270 committing changelog | |
| 268 applying p3 | 271 applying p3 |
| 269 saving current version of b as b.orig | 272 saving current version of b as b.orig |
| 270 saving current version of d as d.orig | 273 saving current version of d as d.orig |
| 271 patching file b | 274 patching file b |
| 272 patching file c | 275 patching file c |
| 275 1 out of 1 hunks FAILED -- saving rejects to file d.rej | 278 1 out of 1 hunks FAILED -- saving rejects to file d.rej |
| 276 patching file e | 279 patching file e |
| 277 file e already exists | 280 file e already exists |
| 278 1 out of 1 hunks FAILED -- saving rejects to file e.rej | 281 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
| 279 patch failed to apply | 282 patch failed to apply |
| 283 committing files: | |
| 280 b | 284 b |
| 285 committing manifest | |
| 286 committing changelog | |
| 281 patch failed, rejects left in working dir | 287 patch failed, rejects left in working dir |
| 282 errors during apply, please fix and refresh p3 | 288 errors during apply, please fix and refresh p3 |
| 283 [2] | 289 [2] |
| 284 $ cat a.orig | 290 $ cat a.orig |
| 285 a | 291 a |
| 300 $ echo a >> a | 306 $ echo a >> a |
| 301 $ rm a.orig | 307 $ rm a.orig |
| 302 $ hg qpush --force --no-backup --verbose | 308 $ hg qpush --force --no-backup --verbose |
| 303 applying p2 | 309 applying p2 |
| 304 patching file a | 310 patching file a |
| 305 a | 311 committing files: |
| 312 a | |
| 313 committing manifest | |
| 314 committing changelog | |
| 306 now at: p2 | 315 now at: p2 |
| 307 $ test -f a.orig && echo 'error: backup with --no-backup' | 316 $ test -f a.orig && echo 'error: backup with --no-backup' |
| 308 [1] | 317 [1] |
| 309 | 318 |
| 310 test qgoto --force --no-backup | 319 test qgoto --force --no-backup |
| 314 patch queue now empty | 323 patch queue now empty |
| 315 $ echo a >> a | 324 $ echo a >> a |
| 316 $ hg qgoto --force --no-backup p2 --verbose | 325 $ hg qgoto --force --no-backup p2 --verbose |
| 317 applying p2 | 326 applying p2 |
| 318 patching file a | 327 patching file a |
| 319 a | 328 committing files: |
| 329 a | |
| 330 committing manifest | |
| 331 committing changelog | |
| 320 now at: p2 | 332 now at: p2 |
| 321 $ test -f a.orig && echo 'error: backup with --no-backup' | 333 $ test -f a.orig && echo 'error: backup with --no-backup' |
| 322 [1] | 334 [1] |
| 323 | 335 |
| 324 test qpush --keep-changes | 336 test qpush --keep-changes |