736 |
736 |
737 $ hg --config extensions.extdiff= extdiff -r 0 -r '.^' -S |
737 $ hg --config extensions.extdiff= extdiff -r 0 -r '.^' -S |
738 diff -Nru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob) |
738 diff -Nru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob) |
739 --- cloned.*/.hglf/b.dat * (glob) |
739 --- cloned.*/.hglf/b.dat * (glob) |
740 +++ cloned.*/.hglf/b.dat * (glob) |
740 +++ cloned.*/.hglf/b.dat * (glob) |
741 @@ -0,0 +1* @@ (glob) |
741 @@ -*,0 +1* @@ (glob) |
742 +da39a3ee5e6b4b0d3255bfef95601890afd80709 |
742 +da39a3ee5e6b4b0d3255bfef95601890afd80709 |
743 diff -Nru 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) |
744 --- cloned.*/.hglf/foo/bar/large.dat * (glob) |
744 --- cloned.*/.hglf/foo/bar/large.dat * (glob) |
745 +++ cloned.*/.hglf/foo/bar/large.dat * (glob) |
745 +++ cloned.*/.hglf/foo/bar/large.dat * (glob) |
746 @@ -0,0 +1* @@ (glob) |
746 @@ -*,0 +1* @@ (glob) |
747 +2f6933b5ee0f5fdd823d9717d8729f3c2523811b |
747 +2f6933b5ee0f5fdd823d9717d8729f3c2523811b |
748 diff -Nru cloned.*/.hglf/large.bin cloned.*/.hglf/large.bin (glob) |
748 diff -Nru cloned.*/.hglf/large.bin cloned.*/.hglf/large.bin (glob) |
749 --- cloned.*/.hglf/large.bin * (glob) |
749 --- cloned.*/.hglf/large.bin * (glob) |
750 +++ cloned.*/.hglf/large.bin * (glob) |
750 +++ cloned.*/.hglf/large.bin * (glob) |
751 @@ -0,0 +1* @@ (glob) |
751 @@ -*,0 +1* @@ (glob) |
752 +7f7097b041ccf68cc5561e9600da4655d21c6d18 |
752 +7f7097b041ccf68cc5561e9600da4655d21c6d18 |
753 diff -Nru cloned.*/.hgsub cloned.*/.hgsub (glob) |
753 diff -Nru cloned.*/.hgsub cloned.*/.hgsub (glob) |
754 --- cloned.*/.hgsub * (glob) |
754 --- cloned.*/.hgsub * (glob) |
755 +++ cloned.*/.hgsub * (glob) |
755 +++ cloned.*/.hgsub * (glob) |
756 @@ -1* +1,2 @@ (glob) |
756 @@ -1* +1,2 @@ (glob) |
764 +7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
764 +7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
765 +b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
765 +b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
766 diff -Nru cloned.*/foo/bar/def cloned.*/foo/bar/def (glob) |
766 diff -Nru cloned.*/foo/bar/def cloned.*/foo/bar/def (glob) |
767 --- cloned.*/foo/bar/def * (glob) |
767 --- cloned.*/foo/bar/def * (glob) |
768 +++ cloned.*/foo/bar/def * (glob) |
768 +++ cloned.*/foo/bar/def * (glob) |
769 @@ -0,0 +1* @@ (glob) |
769 @@ -*,0 +1* @@ (glob) |
770 +changed |
770 +changed |
771 diff -Nru cloned.*/main cloned.*/main (glob) |
771 diff -Nru cloned.*/main cloned.*/main (glob) |
772 --- cloned.*/main * (glob) |
772 --- cloned.*/main * (glob) |
773 +++ cloned.*/main * (glob) |
773 +++ cloned.*/main * (glob) |
774 @@ -1* +1* @@ (glob) |
774 @@ -1* +1* @@ (glob) |
781 -c57a0840e3badd667ef3c3ef65471609acb2ba3c sub2 |
781 -c57a0840e3badd667ef3c3ef65471609acb2ba3c sub2 |
782 +c77908c81ccea3794a896c79e98b0e004aee2e9e sub2 |
782 +c77908c81ccea3794a896c79e98b0e004aee2e9e sub2 |
783 diff -Nru 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) |
784 --- cloned.*/sub1/sub2/folder/test.txt * (glob) |
784 --- cloned.*/sub1/sub2/folder/test.txt * (glob) |
785 +++ cloned.*/sub1/sub2/folder/test.txt * (glob) |
785 +++ cloned.*/sub1/sub2/folder/test.txt * (glob) |
786 @@ -0,0 +1* @@ (glob) |
786 @@ -*,0 +1* @@ (glob) |
787 +subfolder |
787 +subfolder |
788 diff -Nru cloned.*/sub1/sub2/sub2 cloned.*/sub1/sub2/sub2 (glob) |
788 diff -Nru cloned.*/sub1/sub2/sub2 cloned.*/sub1/sub2/sub2 (glob) |
789 --- cloned.*/sub1/sub2/sub2 * (glob) |
789 --- cloned.*/sub1/sub2/sub2 * (glob) |
790 +++ cloned.*/sub1/sub2/sub2 * (glob) |
790 +++ cloned.*/sub1/sub2/sub2 * (glob) |
791 @@ -1* +1* @@ (glob) |
791 @@ -1* +1* @@ (glob) |
792 -sub2 |
792 -sub2 |
793 +modified |
793 +modified |
794 diff -Nru cloned.*/sub3/a.txt cloned.*/sub3/a.txt (glob) |
794 diff -Nru cloned.*/sub3/a.txt cloned.*/sub3/a.txt (glob) |
795 --- cloned.*/sub3/a.txt * (glob) |
795 --- cloned.*/sub3/a.txt * (glob) |
796 +++ cloned.*/sub3/a.txt * (glob) |
796 +++ cloned.*/sub3/a.txt * (glob) |
797 @@ -0,0 +1* @@ (glob) |
797 @@ -*,0 +1* @@ (glob) |
798 +xyz |
798 +xyz |
799 [1] |
799 [1] |
800 |
800 |
801 $ echo mod > sub1/sub2/sub2 |
801 $ echo mod > sub1/sub2/sub2 |
802 $ hg --config extensions.extdiff= extdiff -S |
802 $ hg --config extensions.extdiff= extdiff -S |