Mercurial > hg
annotate tests/test-diff-newlines.t @ 14732:e9ed3506f066 stable
backout of d04ba50e104d: allow to qpop/push with a dirty working copy
The new behavior was breaking existing tools that relied on a sequence such as
this:
1) start with a dirty working copy
2) qimport some patch
3) try to qpush it
4) old behavior would fail at this point due to outstanding changes.
(new behavior would only fail if the outstanding changes and the patches
changes intersect)
5) innocent user qrefreshes, gets his local changes in the imported patch
It's worth considering if we can move this behavior to -f in the future.
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Fri, 24 Jun 2011 23:25:42 +0300 |
parents | 05fffd665170 |
children | cf0f3cb8a332 |
rev | line source |
---|---|
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 |
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
3 $ python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a |
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 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12143
diff
changeset
|
16 embedded\rnewline (esc) |
12143
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
17 +clean diff |
bf840a3d1af2
tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents:
2248
diff
changeset
|
18 |