equal
deleted
inserted
replaced
890 $ hg annotate --ignore-blank-lines a |
890 $ hg annotate --ignore-blank-lines a |
891 1: a a |
891 1: a a |
892 0: |
892 0: |
893 1: |
893 1: |
894 1: b b |
894 1: b b |
|
895 |
|
896 $ cd .. |
|
897 |
|
898 Annotate with orphaned CR (issue5798) |
|
899 ------------------------------------- |
|
900 |
|
901 $ hg init repo-cr |
|
902 $ cd repo-cr |
|
903 |
|
904 $ substcr() { |
|
905 > sed 's/\r/[CR]/g' |
|
906 > } |
|
907 |
|
908 >>> with open('a', 'wb') as f: |
|
909 ... f.write(b'0a\r0b\r\n0c\r0d\r\n0e\n0f\n0g') |
|
910 $ hg ci -qAm0 |
|
911 >>> with open('a', 'wb') as f: |
|
912 ... f.write(b'0a\r0b\r\n1c\r1d\r\n0e\n1f\n0g') |
|
913 $ hg ci -m1 |
|
914 |
|
915 $ hg annotate -r0 a | substcr |
|
916 0: 0a[CR]0b[CR] |
|
917 0: 0c[CR]0d[CR] |
|
918 0: 0e |
|
919 0: 0f |
|
920 0: 0g |
|
921 $ hg annotate -r1 a | substcr |
|
922 0: 0a[CR]0b[CR] |
|
923 1: 1c[CR]1d[CR] |
|
924 0: 0e |
|
925 1: 1f |
|
926 0: 0g |
895 |
927 |
896 $ cd .. |
928 $ cd .. |
897 |
929 |
898 Annotate with linkrev pointing to another branch |
930 Annotate with linkrev pointing to another branch |
899 ------------------------------------------------ |
931 ------------------------------------------------ |