Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/i18n.py @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 660504812daf |
children |
rev | line source |
---|---|
1400
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
1 """ |
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
2 i18n.py - internationalization support for mercurial |
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
3 |
2858 | 4 Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> |
1400
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
5 |
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
6 This software may be used and distributed according to the terms |
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
7 of the GNU General Public License, incorporated herein by reference. |
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
8 """ |
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
diff
changeset
|
9 |
3890
660504812daf
Enable gettext translations
Matt Mackall <mpm@selenic.com>
parents:
2858
diff
changeset
|
10 import gettext |
660504812daf
Enable gettext translations
Matt Mackall <mpm@selenic.com>
parents:
2858
diff
changeset
|
11 t = gettext.translation('hg', fallback=1) |
660504812daf
Enable gettext translations
Matt Mackall <mpm@selenic.com>
parents:
2858
diff
changeset
|
12 gettext = t.gettext |
660504812daf
Enable gettext translations
Matt Mackall <mpm@selenic.com>
parents:
2858
diff
changeset
|
13 _ = gettext |