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