Mercurial > hg
comparison tests/test-annotate.t @ 36690:b529e640015d
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Sun, 04 Mar 2018 10:42:51 -0500 |
parents | 2a258985ffeb 0a7c59a4c835 |
children | 7bf80d9d9543 |
comparison
equal
deleted
inserted
replaced
36685:2a258985ffeb | 36690:b529e640015d |
---|---|
892 $ hg annotate --ignore-blank-lines a | 892 $ hg annotate --ignore-blank-lines a |
893 1: a a | 893 1: a a |
894 0: | 894 0: |
895 1: | 895 1: |
896 1: b b | 896 1: b b |
897 | |
898 $ cd .. | |
899 | |
900 Annotate with orphaned CR (issue5798) | |
901 ------------------------------------- | |
902 | |
903 $ hg init repo-cr | |
904 $ cd repo-cr | |
905 | |
906 $ substcr() { | |
907 > sed 's/\r/[CR]/g' | |
908 > } | |
909 | |
910 >>> with open('a', 'wb') as f: | |
911 ... f.write(b'0a\r0b\r\n0c\r0d\r\n0e\n0f\n0g') | |
912 $ hg ci -qAm0 | |
913 >>> with open('a', 'wb') as f: | |
914 ... f.write(b'0a\r0b\r\n1c\r1d\r\n0e\n1f\n0g') | |
915 $ hg ci -m1 | |
916 | |
917 $ hg annotate -r0 a | substcr | |
918 0: 0a[CR]0b[CR] | |
919 0: 0c[CR]0d[CR] | |
920 0: 0e | |
921 0: 0f | |
922 0: 0g | |
923 $ hg annotate -r1 a | substcr | |
924 0: 0a[CR]0b[CR] | |
925 1: 1c[CR]1d[CR] | |
926 0: 0e | |
927 1: 1f | |
928 0: 0g | |
897 | 929 |
898 $ cd .. | 930 $ cd .. |
899 | 931 |
900 Annotate with linkrev pointing to another branch | 932 Annotate with linkrev pointing to another branch |
901 ------------------------------------------------ | 933 ------------------------------------------------ |