712 Interaction with extdiff, largefiles and subrepos |
718 Interaction with extdiff, largefiles and subrepos |
713 |
719 |
714 $ hg --config extensions.extdiff= extdiff -S |
720 $ hg --config extensions.extdiff= extdiff -S |
715 |
721 |
716 $ hg --config extensions.extdiff= extdiff -r '.^' -S |
722 $ hg --config extensions.extdiff= extdiff -r '.^' -S |
717 diff -Npru cloned.*/.hgsub cloned/.hgsub (glob) |
723 diff -Nru cloned.*/.hgsub cloned/.hgsub (glob) |
718 --- cloned.*/.hgsub * +0000 (glob) |
724 --- cloned.*/.hgsub * +0000 (glob) |
719 +++ cloned/.hgsub * +0000 (glob) |
725 +++ cloned/.hgsub * +0000 (glob) |
720 @@ -1,2 +1 @@ |
726 @@ -1,2 +1 @@ |
721 sub1 = ../sub1 |
727 sub1 = ../sub1 |
722 -sub3 = sub3 |
728 -sub3 = sub3 |
723 diff -Npru cloned.*/.hgsubstate cloned/.hgsubstate (glob) |
729 diff -Nru cloned.*/.hgsubstate cloned/.hgsubstate (glob) |
724 --- cloned.*/.hgsubstate * +0000 (glob) |
730 --- cloned.*/.hgsubstate * +0000 (glob) |
725 +++ cloned/.hgsubstate * +0000 (glob) |
731 +++ cloned/.hgsubstate * +0000 (glob) |
726 @@ -1,2 +1 @@ |
732 @@ -1,2 +1 @@ |
727 7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
733 7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
728 -b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
734 -b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
729 [1] |
735 [1] |
730 |
736 |
731 $ hg --config extensions.extdiff= extdiff -r 0 -r '.^' -S |
737 $ hg --config extensions.extdiff= extdiff -r 0 -r '.^' -S |
732 diff -Npru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob) |
738 diff -Nru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob) |
733 --- cloned.*/.hglf/b.dat * (glob) |
739 --- cloned.*/.hglf/b.dat * (glob) |
734 +++ cloned.*/.hglf/b.dat * (glob) |
740 +++ cloned.*/.hglf/b.dat * (glob) |
735 @@ -0,0 +1 @@ |
741 @@ -0,0 +1 @@ |
736 +da39a3ee5e6b4b0d3255bfef95601890afd80709 |
742 +da39a3ee5e6b4b0d3255bfef95601890afd80709 |
737 diff -Npru cloned.*/.hglf/foo/bar/large.dat cloned.*/.hglf/foo/bar/large.dat (glob) |
743 diff -Nru cloned.*/.hglf/foo/bar/large.dat cloned.*/.hglf/foo/bar/large.dat (glob) |
738 --- cloned.*/.hglf/foo/bar/large.dat * (glob) |
744 --- cloned.*/.hglf/foo/bar/large.dat * (glob) |
739 +++ cloned.*/.hglf/foo/bar/large.dat * (glob) |
745 +++ cloned.*/.hglf/foo/bar/large.dat * (glob) |
740 @@ -0,0 +1 @@ |
746 @@ -0,0 +1 @@ |
741 +2f6933b5ee0f5fdd823d9717d8729f3c2523811b |
747 +2f6933b5ee0f5fdd823d9717d8729f3c2523811b |
742 diff -Npru cloned.*/.hglf/large.bin cloned.*/.hglf/large.bin (glob) |
748 diff -Nru cloned.*/.hglf/large.bin cloned.*/.hglf/large.bin (glob) |
743 --- cloned.*/.hglf/large.bin * (glob) |
749 --- cloned.*/.hglf/large.bin * (glob) |
744 +++ cloned.*/.hglf/large.bin * (glob) |
750 +++ cloned.*/.hglf/large.bin * (glob) |
745 @@ -0,0 +1 @@ |
751 @@ -0,0 +1 @@ |
746 +7f7097b041ccf68cc5561e9600da4655d21c6d18 |
752 +7f7097b041ccf68cc5561e9600da4655d21c6d18 |
747 diff -Npru cloned.*/.hgsub cloned.*/.hgsub (glob) |
753 diff -Nru cloned.*/.hgsub cloned.*/.hgsub (glob) |
748 --- cloned.*/.hgsub * (glob) |
754 --- cloned.*/.hgsub * (glob) |
749 +++ cloned.*/.hgsub * (glob) |
755 +++ cloned.*/.hgsub * (glob) |
750 @@ -1 +1,2 @@ |
756 @@ -1 +1,2 @@ |
751 sub1 = ../sub1 |
757 sub1 = ../sub1 |
752 +sub3 = sub3 |
758 +sub3 = sub3 |
753 diff -Npru cloned.*/.hgsubstate cloned.*/.hgsubstate (glob) |
759 diff -Nru cloned.*/.hgsubstate cloned.*/.hgsubstate (glob) |
754 --- cloned.*/.hgsubstate * (glob) |
760 --- cloned.*/.hgsubstate * (glob) |
755 +++ cloned.*/.hgsubstate * (glob) |
761 +++ cloned.*/.hgsubstate * (glob) |
756 @@ -1 +1,2 @@ |
762 @@ -1 +1,2 @@ |
757 -fc3b4ce2696f7741438c79207583768f2ce6b0dd sub1 |
763 -fc3b4ce2696f7741438c79207583768f2ce6b0dd sub1 |
758 +7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
764 +7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
759 +b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
765 +b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
760 diff -Npru cloned.*/foo/bar/def cloned.*/foo/bar/def (glob) |
766 diff -Nru cloned.*/foo/bar/def cloned.*/foo/bar/def (glob) |
761 --- cloned.*/foo/bar/def * (glob) |
767 --- cloned.*/foo/bar/def * (glob) |
762 +++ cloned.*/foo/bar/def * (glob) |
768 +++ cloned.*/foo/bar/def * (glob) |
763 @@ -0,0 +1 @@ |
769 @@ -0,0 +1 @@ |
764 +changed |
770 +changed |
765 diff -Npru cloned.*/main cloned.*/main (glob) |
771 diff -Nru cloned.*/main cloned.*/main (glob) |
766 --- cloned.*/main * (glob) |
772 --- cloned.*/main * (glob) |
767 +++ cloned.*/main * (glob) |
773 +++ cloned.*/main * (glob) |
768 @@ -1 +1 @@ |
774 @@ -1 +1 @@ |
769 -main |
775 -main |
770 +foo |
776 +foo |
771 diff -Npru cloned.*/sub1/.hgsubstate cloned.*/sub1/.hgsubstate (glob) |
777 diff -Nru cloned.*/sub1/.hgsubstate cloned.*/sub1/.hgsubstate (glob) |
772 --- cloned.*/sub1/.hgsubstate * (glob) |
778 --- cloned.*/sub1/.hgsubstate * (glob) |
773 +++ cloned.*/sub1/.hgsubstate * (glob) |
779 +++ cloned.*/sub1/.hgsubstate * (glob) |
774 @@ -1 +1 @@ |
780 @@ -1 +1 @@ |
775 -c57a0840e3badd667ef3c3ef65471609acb2ba3c sub2 |
781 -c57a0840e3badd667ef3c3ef65471609acb2ba3c sub2 |
776 +c77908c81ccea3794a896c79e98b0e004aee2e9e sub2 |
782 +c77908c81ccea3794a896c79e98b0e004aee2e9e sub2 |
777 diff -Npru cloned.*/sub1/sub2/folder/test.txt cloned.*/sub1/sub2/folder/test.txt (glob) |
783 diff -Nru cloned.*/sub1/sub2/folder/test.txt cloned.*/sub1/sub2/folder/test.txt (glob) |
778 --- cloned.*/sub1/sub2/folder/test.txt * (glob) |
784 --- cloned.*/sub1/sub2/folder/test.txt * (glob) |
779 +++ cloned.*/sub1/sub2/folder/test.txt * (glob) |
785 +++ cloned.*/sub1/sub2/folder/test.txt * (glob) |
780 @@ -0,0 +1 @@ |
786 @@ -0,0 +1 @@ |
781 +subfolder |
787 +subfolder |
782 diff -Npru cloned.*/sub1/sub2/sub2 cloned.*/sub1/sub2/sub2 (glob) |
788 diff -Nru cloned.*/sub1/sub2/sub2 cloned.*/sub1/sub2/sub2 (glob) |
783 --- cloned.*/sub1/sub2/sub2 * (glob) |
789 --- cloned.*/sub1/sub2/sub2 * (glob) |
784 +++ cloned.*/sub1/sub2/sub2 * (glob) |
790 +++ cloned.*/sub1/sub2/sub2 * (glob) |
785 @@ -1 +1 @@ |
791 @@ -1 +1 @@ |
786 -sub2 |
792 -sub2 |
787 +modified |
793 +modified |
788 diff -Npru cloned.*/sub3/a.txt cloned.*/sub3/a.txt (glob) |
794 diff -Nru cloned.*/sub3/a.txt cloned.*/sub3/a.txt (glob) |
789 --- cloned.*/sub3/a.txt * (glob) |
795 --- cloned.*/sub3/a.txt * (glob) |
790 +++ cloned.*/sub3/a.txt * (glob) |
796 +++ cloned.*/sub3/a.txt * (glob) |
791 @@ -0,0 +1 @@ |
797 @@ -0,0 +1 @@ |
792 +xyz |
798 +xyz |
793 [1] |
799 [1] |