| author | Matt Mackall <mpm@selenic.com> |
| Fri, 22 Feb 2013 13:46:54 -0600 | |
| changeset 18716 | 963468e9f9e5 |
| parent 17742 | 405b6bd015df |
| child 22947 | c63a09b6b337 |
| permissions | -rw-r--r-- |
|
12143
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
1 |
$ hg init |
|
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
2 |
|
|
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
12942
diff
changeset
|
3 |
$ python -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'
|
|
12143
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
4 |
$ hg ci -Ama -d '1 0' |
|
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
5 |
adding a |
|
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
6 |
|
|
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
7 |
$ echo clean diff >> a |
|
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
8 |
$ hg ci -mb -d '2 0' |
|
2248
b914f0557832
fix diffs containing embedded "\r".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 |
|
|
12143
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
10 |
$ hg diff -r0 -r1 |
|
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
11 |
diff -r 107ba6f817b5 -r 310ce7989cdc a |
|
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
12 |
--- a/a Thu Jan 01 00:00:01 1970 +0000 |
|
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
13 |
+++ b/a Thu Jan 01 00:00:02 1970 +0000 |
|
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
14 |
@@ -1,2 +1,3 @@ |
|
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
15 |
confuse str.splitlines |
|
17742
405b6bd015df
run-tests: allow test output lines to be terminated with \r in addition to \n
Mads Kiilerich <mads@kiilerich.com>
parents:
15522
diff
changeset
|
16 |
embedded\r (no-eol) (esc) |
|
405b6bd015df
run-tests: allow test output lines to be terminated with \r in addition to \n
Mads Kiilerich <mads@kiilerich.com>
parents:
15522
diff
changeset
|
17 |
newline |
|
12143
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
18 |
+clean diff |
|
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
19 |