Mercurial > hg
annotate tests/test-i18n.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 | bb107a31820e |
children | f85c9b0fdb32 |
rev | line source |
---|---|
13442
bb107a31820e
test-i18n: make test conditional on msgfmt availability
Martin Geisler <mg@lazybytes.net>
parents:
13414
diff
changeset
|
1 Translations are optional: |
bb107a31820e
test-i18n: make test conditional on msgfmt availability
Martin Geisler <mg@lazybytes.net>
parents:
13414
diff
changeset
|
2 |
bb107a31820e
test-i18n: make test conditional on msgfmt availability
Martin Geisler <mg@lazybytes.net>
parents:
13414
diff
changeset
|
3 $ "$TESTDIR/hghave" gettext || exit 80 |
bb107a31820e
test-i18n: make test conditional on msgfmt availability
Martin Geisler <mg@lazybytes.net>
parents:
13414
diff
changeset
|
4 |
13414 | 5 Test that translations are compiled and installed correctly. |
6 | |
7 Default encoding in tests is "ascii" and the translation is encoded | |
8 using the "replace" error handler: | |
9 | |
10 $ LANGUAGE=pt_BR hg tip | |
11 abortado: N?o h? um reposit?rio do Mercurial aqui (.hg n?o encontrado)! | |
12 [255] | |
13 | |
14 Using a more accomodating encoding: | |
15 | |
16 $ HGENCODING=UTF-8 LANGUAGE=pt_BR hg tip | |
17 abortado: N\xc3\xa3o h\xc3\xa1 um reposit\xc3\xb3rio do Mercurial aqui (.hg n\xc3\xa3o encontrado)! (esc) | |
18 [255] | |
19 | |
20 Different encoding: | |
21 | |
22 $ HGENCODING=Latin-1 LANGUAGE=pt_BR hg tip | |
23 abortado: N\xe3o h\xe1 um reposit\xf3rio do Mercurial aqui (.hg n\xe3o encontrado)! (esc) | |
24 [255] |