##// END OF EJS Templates
py3: fix test-diff-newlines.t to be compatible with py3
Boris Feld -
r33305:aaa1f8f5 default
parent child Browse files
Show More
@@ -1,34 +1,35 b''
1 test-ancestor.py
1 test-ancestor.py
2 test-backwards-remove.t
2 test-backwards-remove.t
3 test-branch-tag-confict.t
3 test-branch-tag-confict.t
4 test-casecollision.t
4 test-casecollision.t
5 test-check-commit.t
5 test-check-commit.t
6 test-check-execute.t
6 test-check-execute.t
7 test-check-pyflakes.t
7 test-check-pyflakes.t
8 test-check-pylint.t
8 test-check-pylint.t
9 test-check-shbang.t
9 test-check-shbang.t
10 test-contrib-check-code.t
10 test-contrib-check-code.t
11 test-contrib-check-commit.t
11 test-contrib-check-commit.t
12 test-ctxmanager.py
12 test-ctxmanager.py
13 test-diff-issue2761.t
13 test-diff-issue2761.t
14 test-diff-newlines.t
14 test-diff-reverse.t
15 test-diff-reverse.t
15 test-diff-subdir.t
16 test-diff-subdir.t
16 test-dirstate-nonnormalset.t
17 test-dirstate-nonnormalset.t
17 test-doctest.py
18 test-doctest.py
18 test-empty-dir.t
19 test-empty-dir.t
19 test-excessive-merge.t
20 test-excessive-merge.t
20 test-issue1089.t
21 test-issue1089.t
21 test-issue1993.t
22 test-issue1993.t
22 test-issue842.t
23 test-issue842.t
23 test-locate.t
24 test-locate.t
24 test-lrucachedict.py
25 test-lrucachedict.py
25 test-manifest.py
26 test-manifest.py
26 test-merge-default.t
27 test-merge-default.t
27 test-merge-subrepos.t
28 test-merge-subrepos.t
28 test-merge2.t
29 test-merge2.t
29 test-merge5.t
30 test-merge5.t
30 test-revlog-packentry.t
31 test-revlog-packentry.t
31 test-run-tests.py
32 test-run-tests.py
32 test-unified-test.t
33 test-unified-test.t
33 test-update-reverse.t
34 test-update-reverse.t
34 test-xdg.t
35 test-xdg.t
@@ -1,19 +1,19 b''
1 $ hg init
1 $ hg init
2
2
3 $ $PYTHON -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'
3 $ $PYTHON -c 'open("a", "wb").write(b"confuse str.splitlines\nembedded\rnewline\n")'
4 $ hg ci -Ama -d '1 0'
4 $ hg ci -Ama -d '1 0'
5 adding a
5 adding a
6
6
7 $ echo clean diff >> a
7 $ echo clean diff >> a
8 $ hg ci -mb -d '2 0'
8 $ hg ci -mb -d '2 0'
9
9
10 $ hg diff -r0 -r1
10 $ hg diff -r0 -r1
11 diff -r 107ba6f817b5 -r 310ce7989cdc a
11 diff -r 107ba6f817b5 -r 310ce7989cdc a
12 --- a/a Thu Jan 01 00:00:01 1970 +0000
12 --- a/a Thu Jan 01 00:00:01 1970 +0000
13 +++ b/a Thu Jan 01 00:00:02 1970 +0000
13 +++ b/a Thu Jan 01 00:00:02 1970 +0000
14 @@ -1,2 +1,3 @@
14 @@ -1,2 +1,3 @@
15 confuse str.splitlines
15 confuse str.splitlines
16 embedded\r (no-eol) (esc)
16 embedded\r (no-eol) (esc)
17 newline
17 newline
18 +clean diff
18 +clean diff
19
19
General Comments 0
You need to be logged in to leave comments. Login now