equal
deleted
inserted
replaced
1 $ cat >> $HGRCPATH <<EOF |
1 $ cat >> $HGRCPATH <<EOF |
2 > [defaults] |
2 > [extdiff] |
3 > # for portability |
3 > # for portability: |
4 > extdiff = --option -Nru |
4 > pdiff = sh "$RUNTESTDIR/pdiff" |
5 > EOF |
5 > EOF |
6 |
6 |
7 Preparing the subrepository 'sub2' |
7 Preparing the subrepository 'sub2' |
8 |
8 |
9 $ hg init sub2 |
9 $ hg init sub2 |
715 $ hg rollback -q |
715 $ hg rollback -q |
716 $ hg update -Cq . |
716 $ hg update -Cq . |
717 |
717 |
718 Interaction with extdiff, largefiles and subrepos |
718 Interaction with extdiff, largefiles and subrepos |
719 |
719 |
720 $ hg --config extensions.extdiff= extdiff -S |
720 $ hg --config extensions.extdiff= pdiff -S |
721 |
721 |
722 $ hg --config extensions.extdiff= extdiff -r '.^' -S |
722 $ hg --config extensions.extdiff= pdiff -r '.^' -S |
723 diff -Nru cloned.*/.hgsub cloned/.hgsub (glob) |
723 diff -Nru cloned.*/.hgsub cloned/.hgsub (glob) |
724 --- cloned.*/.hgsub * (glob) |
724 --- cloned.*/.hgsub * (glob) |
725 +++ cloned/.hgsub * (glob) |
725 +++ cloned/.hgsub * (glob) |
726 @@ -1,2 +1* @@ (glob) |
726 @@ -1,2 +1* @@ (glob) |
727 sub1 = ../sub1 |
727 sub1 = ../sub1 |
732 @@ -1,2 +1* @@ (glob) |
732 @@ -1,2 +1* @@ (glob) |
733 7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
733 7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
734 -b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
734 -b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
735 [1] |
735 [1] |
736 |
736 |
737 $ hg --config extensions.extdiff= extdiff -r 0 -r '.^' -S |
737 $ hg --config extensions.extdiff= pdiff -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 +1* @@ (glob) |
741 @@ -*,0 +1* @@ (glob) |
742 +da39a3ee5e6b4b0d3255bfef95601890afd80709 |
742 +da39a3ee5e6b4b0d3255bfef95601890afd80709 |
797 @@ -*,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= pdiff -S |
803 --- */cloned.*/sub1/sub2/sub2 * (glob) |
803 --- */cloned.*/sub1/sub2/sub2 * (glob) |
804 +++ */cloned/sub1/sub2/sub2 * (glob) |
804 +++ */cloned/sub1/sub2/sub2 * (glob) |
805 @@ -1* +1* @@ (glob) |
805 @@ -1* +1* @@ (glob) |
806 -modified |
806 -modified |
807 +mod |
807 +mod |