Mercurial > hg
annotate tests/test-diff-newlines.t @ 14050:9e8a9d45945c stable
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant and only works with svn >= 1.5 but the only
alternative I can think of is to write our own purge command for subversion.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 04 Mar 2011 14:00:49 +0100 |
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 |