Mercurial > hg

comparison tests/test-subrepo-deep-nested-change.t @ 25813:18bae5eb58c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: add support for subrepos Git and svn subrepo support is incomplete, because they don't support archiving the working copy.
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 15 Jul 2012 12:43:10 -0400
parents 98064baab877
children 1b449b012073
comparison
equal deleted inserted replaced
25812:68822b7cdd01 25813:18bae5eb58c5
707 Restore the trashed subrepo tracking 707 Restore the trashed subrepo tracking
708 708
709 $ hg rollback -q 709 $ hg rollback -q
710 $ hg update -Cq . 710 $ hg update -Cq .
711 711
712 Interaction with extdiff, largefiles and subrepos
713
714 $ hg --config extensions.extdiff= extdiff -S
715
716 $ hg --config extensions.extdiff= extdiff -r '.^' -S
717 diff -Npru cloned.*/.hgsub cloned/.hgsub (glob)
718 --- cloned.*/.hgsub * +0000 (glob)
719 +++ cloned/.hgsub * +0000 (glob)
720 @@ -1,2 +1 @@
721 sub1 = ../sub1
722 -sub3 = sub3
723 diff -Npru cloned.*/.hgsubstate cloned/.hgsubstate (glob)
724 --- cloned.*/.hgsubstate * +0000 (glob)
725 +++ cloned/.hgsubstate * +0000 (glob)
726 @@ -1,2 +1 @@
727 7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1
728 -b1a26de6f2a045a9f079323693614ee322f1ff7e sub3
729 [1]
730
731 $ hg --config extensions.extdiff= extdiff -r 0 -r '.^' -S
732 diff -Npru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob)
733 --- cloned.*/.hglf/b.dat * (glob)
734 +++ cloned.*/.hglf/b.dat * (glob)
735 @@ -0,0 +1 @@
736 +da39a3ee5e6b4b0d3255bfef95601890afd80709
737 diff -Npru cloned.*/.hglf/foo/bar/large.dat cloned.*/.hglf/foo/bar/large.dat (glob)
738 --- cloned.*/.hglf/foo/bar/large.dat * (glob)
739 +++ cloned.*/.hglf/foo/bar/large.dat * (glob)
740 @@ -0,0 +1 @@
741 +2f6933b5ee0f5fdd823d9717d8729f3c2523811b
742 diff -Npru cloned.*/.hglf/large.bin cloned.*/.hglf/large.bin (glob)
743 --- cloned.*/.hglf/large.bin * (glob)
744 +++ cloned.*/.hglf/large.bin * (glob)
745 @@ -0,0 +1 @@
746 +7f7097b041ccf68cc5561e9600da4655d21c6d18
747 diff -Npru cloned.*/.hgsub cloned.*/.hgsub (glob)
748 --- cloned.*/.hgsub * (glob)
749 +++ cloned.*/.hgsub * (glob)
750 @@ -1 +1,2 @@
751 sub1 = ../sub1
752 +sub3 = sub3
753 diff -Npru cloned.*/.hgsubstate cloned.*/.hgsubstate (glob)
754 --- cloned.*/.hgsubstate * (glob)
755 +++ cloned.*/.hgsubstate * (glob)
756 @@ -1 +1,2 @@
757 -fc3b4ce2696f7741438c79207583768f2ce6b0dd sub1
758 +7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1
759 +b1a26de6f2a045a9f079323693614ee322f1ff7e sub3
760 diff -Npru cloned.*/foo/bar/def cloned.*/foo/bar/def (glob)
761 --- cloned.*/foo/bar/def * (glob)
762 +++ cloned.*/foo/bar/def * (glob)
763 @@ -0,0 +1 @@
764 +changed
765 diff -Npru cloned.*/main cloned.*/main (glob)
766 --- cloned.*/main * (glob)
767 +++ cloned.*/main * (glob)
768 @@ -1 +1 @@
769 -main
770 +foo
771 diff -Npru cloned.*/sub1/.hgsubstate cloned.*/sub1/.hgsubstate (glob)
772 --- cloned.*/sub1/.hgsubstate * (glob)
773 +++ cloned.*/sub1/.hgsubstate * (glob)
774 @@ -1 +1 @@
775 -c57a0840e3badd667ef3c3ef65471609acb2ba3c sub2
776 +c77908c81ccea3794a896c79e98b0e004aee2e9e sub2
777 diff -Npru cloned.*/sub1/sub2/folder/test.txt cloned.*/sub1/sub2/folder/test.txt (glob)
778 --- cloned.*/sub1/sub2/folder/test.txt * (glob)
779 +++ cloned.*/sub1/sub2/folder/test.txt * (glob)
780 @@ -0,0 +1 @@
781 +subfolder
782 diff -Npru cloned.*/sub1/sub2/sub2 cloned.*/sub1/sub2/sub2 (glob)
783 --- cloned.*/sub1/sub2/sub2 * (glob)
784 +++ cloned.*/sub1/sub2/sub2 * (glob)
785 @@ -1 +1 @@
786 -sub2
787 +modified
788 diff -Npru cloned.*/sub3/a.txt cloned.*/sub3/a.txt (glob)
789 --- cloned.*/sub3/a.txt * (glob)
790 +++ cloned.*/sub3/a.txt * (glob)
791 @@ -0,0 +1 @@
792 +xyz
793 [1]
794
795 $ echo mod > sub1/sub2/sub2
796 $ hg --config extensions.extdiff= extdiff -S
797 --- */cloned.*/sub1/sub2/sub2 * (glob)
798 +++ */cloned/sub1/sub2/sub2 * (glob)
799 @@ -1 +1 @@
800 -modified
801 +mod
802 [1]
803
712 $ cd .. 804 $ cd ..