Mercurial > hg
comparison tests/test-mq.out @ 6554:3182602fa1fb
mq: don't commit local changes on pushing empty patch (issue1087)
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Wed, 16 Apr 2008 16:04:07 +0200 |
parents | 949e607ac544 |
children | 550c53d66949 8d9d09d7c8b7 |
comparison
equal
deleted
inserted
replaced
6553:0bb76d168437 | 6554:3182602fa1fb |
---|---|
482 % test applying on an empty file (issue 1033) | 482 % test applying on an empty file (issue 1033) |
483 adding a | 483 adding a |
484 Patch queue now empty | 484 Patch queue now empty |
485 applying changea | 485 applying changea |
486 Now at: changea | 486 Now at: changea |
487 % test qpush with --force, issue1087 | |
488 adding bye.txt | |
489 adding hello.txt | |
490 Patch queue now empty | |
491 % qpush should fail, local changes | |
492 abort: local changes found, refresh first | |
493 % apply force, should not discard changes with empty patch | |
494 applying empty | |
495 /usr/bin/patch: **** Only garbage was found in the patch input. | |
496 patch failed, unable to continue (try -v) | |
497 patch empty is empty | |
498 Now at: empty | |
499 diff -r bf5fc3f07a0a hello.txt | |
500 --- a/hello.txt | |
501 +++ b/hello.txt | |
502 @@ -1,1 +1,2 @@ | |
503 hello | |
504 +world | |
505 diff -r 9ecee4f634e3 hello.txt | |
506 --- a/hello.txt | |
507 +++ b/hello.txt | |
508 @@ -1,1 +1,2 @@ | |
509 hello | |
510 +world | |
511 changeset: 1:bf5fc3f07a0a | |
512 tag: qtip | |
513 tag: tip | |
514 tag: empty | |
515 tag: qbase | |
516 user: test | |
517 date: Thu Jan 01 00:00:00 1970 +0000 | |
518 summary: imported patch empty | |
519 | |
520 | |
521 Patch queue now empty | |
522 % qpush should fail, local changes | |
523 abort: local changes found, refresh first | |
524 % apply force, should discard changes in hello, but not bye | |
525 applying empty | |
526 Now at: empty | |
527 M bye.txt | |
528 diff -r ba252371dbc1 bye.txt | |
529 --- a/bye.txt | |
530 +++ b/bye.txt | |
531 @@ -1,1 +1,2 @@ | |
532 bye | |
533 +universe | |
534 diff -r 9ecee4f634e3 bye.txt | |
535 --- a/bye.txt | |
536 +++ b/bye.txt | |
537 @@ -1,1 +1,2 @@ | |
538 bye | |
539 +universe | |
540 diff -r 9ecee4f634e3 hello.txt | |
541 --- a/hello.txt | |
542 +++ b/hello.txt | |
543 @@ -1,1 +1,3 @@ | |
544 hello | |
545 +world | |
546 +universe |