equal
deleted
inserted
replaced
517 > Mc$`b*O.$Pw00T?_*Z=?k |
517 > Mc$`b*O.$Pw00T?_*Z=?k |
518 > |
518 > |
519 > EOF |
519 > EOF |
520 applying patch from stdin |
520 applying patch from stdin |
521 abort: could not decode "binary2" binary patch: bad base85 character at position 6 |
521 abort: could not decode "binary2" binary patch: bad base85 character at position 6 |
522 [255] |
522 [10] |
523 |
523 |
524 $ hg revert -aq |
524 $ hg revert -aq |
525 $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" |
525 $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" |
526 > diff --git a/text2 b/binary2 |
526 > diff --git a/text2 b/binary2 |
527 > rename from text2 |
527 > rename from text2 |
532 > Mc$`b*O5$Pw00T?_*Z=?k |
532 > Mc$`b*O5$Pw00T?_*Z=?k |
533 > |
533 > |
534 > EOF |
534 > EOF |
535 applying patch from stdin |
535 applying patch from stdin |
536 abort: "binary2" length is 5 bytes, should be 6 |
536 abort: "binary2" length is 5 bytes, should be 6 |
537 [255] |
537 [10] |
538 |
538 |
539 $ hg revert -aq |
539 $ hg revert -aq |
540 $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" |
540 $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" |
541 > diff --git a/text2 b/binary2 |
541 > diff --git a/text2 b/binary2 |
542 > rename from text2 |
542 > rename from text2 |
546 > Mc$`b*O5$Pw00T?_*Z=?k |
546 > Mc$`b*O5$Pw00T?_*Z=?k |
547 > |
547 > |
548 > EOF |
548 > EOF |
549 applying patch from stdin |
549 applying patch from stdin |
550 abort: could not extract "binary2" binary data |
550 abort: could not extract "binary2" binary data |
551 [255] |
551 [10] |
552 |
552 |
553 Simulate a copy/paste turning LF into CRLF (issue2870) |
553 Simulate a copy/paste turning LF into CRLF (issue2870) |
554 |
554 |
555 $ hg revert -aq |
555 $ hg revert -aq |
556 $ cat > binary.diff <<"EOF" |
556 $ cat > binary.diff <<"EOF" |
746 > copy from a |
746 > copy from a |
747 > copy to b |
747 > copy to b |
748 > EOF |
748 > EOF |
749 applying patch from stdin |
749 applying patch from stdin |
750 abort: cannot create b: destination already exists |
750 abort: cannot create b: destination already exists |
751 [255] |
751 [20] |
752 $ cat b |
752 $ cat b |
753 b |
753 b |
754 |
754 |
755 Copy and changes with existing destination |
755 Copy and changes with existing destination |
756 |
756 |
766 > EOF |
766 > EOF |
767 applying patch from stdin |
767 applying patch from stdin |
768 cannot create b: destination already exists |
768 cannot create b: destination already exists |
769 1 out of 1 hunks FAILED -- saving rejects to file b.rej |
769 1 out of 1 hunks FAILED -- saving rejects to file b.rej |
770 abort: patch failed to apply |
770 abort: patch failed to apply |
771 [255] |
771 [20] |
772 $ cat b |
772 $ cat b |
773 b |
773 b |
774 |
774 |
775 #if symlink |
775 #if symlink |
776 |
776 |
789 applying patch from stdin |
789 applying patch from stdin |
790 patching file linkb |
790 patching file linkb |
791 Hunk #1 FAILED at 0 |
791 Hunk #1 FAILED at 0 |
792 1 out of 1 hunks FAILED -- saving rejects to file linkb.rej |
792 1 out of 1 hunks FAILED -- saving rejects to file linkb.rej |
793 abort: patch failed to apply |
793 abort: patch failed to apply |
794 [255] |
794 [20] |
795 $ hg st |
795 $ hg st |
796 ? b.rej |
796 ? b.rej |
797 ? linkb.rej |
797 ? linkb.rej |
798 |
798 |
799 #endif |
799 #endif |