equal
deleted
inserted
replaced
574 </html> |
574 </html> |
575 |
575 |
576 |
576 |
577 comparison new file |
577 comparison new file |
578 |
578 |
|
579 $ hg parents --template "{rev}:{node|short}\n" -r 0 |
|
580 $ hg log --template "{rev}:{node|short}\n" -r 0 |
|
581 0:0cd96de13884 |
|
582 |
579 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/0/a' |
583 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/0/a' |
580 200 Script output follows |
584 200 Script output follows |
581 |
585 |
582 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
586 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
583 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
587 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
665 |
669 |
666 <table class="bigtable"> |
670 <table class="bigtable"> |
667 <thead class="header"> |
671 <thead class="header"> |
668 <tr> |
672 <tr> |
669 <th>-1:000000000000</th> |
673 <th>-1:000000000000</th> |
670 <th>0:b789fdd96dc2</th> |
674 <th>0:0cd96de13884</th> |
671 </tr> |
675 </tr> |
672 </thead> |
676 </thead> |
673 |
677 |
674 <tbody class="block"> |
678 <tbody class="block"> |
675 |
679 |
695 |
699 |
696 $ hg up |
700 $ hg up |
697 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
701 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
698 $ echo a >> a |
702 $ echo a >> a |
699 $ hg ci -mc |
703 $ hg ci -mc |
|
704 |
|
705 $ hg parents --template "{rev}:{node|short}\n" -r tip |
|
706 1:559edbd9ed20 |
|
707 $ hg log --template "{rev}:{node|short}\n" -r tip |
|
708 2:d73db4d812ff |
|
709 |
700 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/tip/a' |
710 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/tip/a' |
701 200 Script output follows |
711 200 Script output follows |
702 |
712 |
703 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
713 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
704 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
714 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
785 </div> |
795 </div> |
786 |
796 |
787 <table class="bigtable"> |
797 <table class="bigtable"> |
788 <thead class="header"> |
798 <thead class="header"> |
789 <tr> |
799 <tr> |
790 <th>0:b789fdd96dc2</th> |
800 <th>1:559edbd9ed20</th> |
791 <th>1:a80d06849b33</th> |
801 <th>2:d73db4d812ff</th> |
792 </tr> |
802 </tr> |
793 </thead> |
803 </thead> |
794 |
804 |
795 <tbody class="block"> |
805 <tbody class="block"> |
796 |
806 |
818 |
828 |
819 comparison removed file |
829 comparison removed file |
820 |
830 |
821 $ hg rm a |
831 $ hg rm a |
822 $ hg ci -md |
832 $ hg ci -md |
|
833 |
|
834 $ hg parents --template "{rev}:{node|short}\n" -r tip |
|
835 2:d73db4d812ff |
|
836 $ hg log --template "{rev}:{node|short}\n" -r tip |
|
837 3:20e80271eb7a |
|
838 |
823 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/tip/a' |
839 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/tip/a' |
824 200 Script output follows |
840 200 Script output follows |
825 |
841 |
826 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
842 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
827 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
843 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
908 </div> |
924 </div> |
909 |
925 |
910 <table class="bigtable"> |
926 <table class="bigtable"> |
911 <thead class="header"> |
927 <thead class="header"> |
912 <tr> |
928 <tr> |
913 <th>1:a80d06849b33</th> |
929 <th>2:d73db4d812ff</th> |
914 <th>-1:000000000000</th> |
930 <th>3:20e80271eb7a</th> |
915 </tr> |
931 </tr> |
916 </thead> |
932 </thead> |
917 |
933 |
918 <tbody class="block"> |
934 <tbody class="block"> |
919 |
935 |
945 $ hg add e |
961 $ hg add e |
946 $ hg ci -m e |
962 $ hg ci -m e |
947 $ echo f > f |
963 $ echo f > f |
948 $ hg add f |
964 $ hg add f |
949 $ hg ci -m f |
965 $ hg ci -m f |
950 $ hg tip --template "{node|short}\n" |
966 $ hg tip --template "{rev}:{node|short}\n" |
951 41d9fc4a6ae1 |
967 5:41d9fc4a6ae1 |
952 $ hg diff -c tip e |
968 $ hg diff -c tip e |
953 $ hg parents --template "{node|short}\n" -r tip |
969 $ hg parents --template "{rev}:{node|short}\n" -r tip |
954 402bea3b0976 |
970 4:402bea3b0976 |
955 $ hg parents --template "{node|short}\n" -r tip e |
971 $ hg parents --template "{rev}:{node|short}\n" -r tip e |
956 402bea3b0976 |
972 4:402bea3b0976 |
957 |
973 |
958 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/tip/e' |
974 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/tip/e' |
959 200 Script output follows |
975 200 Script output follows |
960 |
976 |
961 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
977 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
1043 </div> |
1059 </div> |
1044 |
1060 |
1045 <table class="bigtable"> |
1061 <table class="bigtable"> |
1046 <thead class="header"> |
1062 <thead class="header"> |
1047 <tr> |
1063 <tr> |
1048 <th>0:6b67ccefd5ce</th> |
1064 <th>4:402bea3b0976</th> |
1049 <th>0:6b67ccefd5ce</th> |
1065 <th>5:41d9fc4a6ae1</th> |
1050 </tr> |
1066 </tr> |
1051 </thead> |
1067 </thead> |
1052 |
1068 |
1053 </table> |
1069 </table> |
1054 |
1070 |