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.

     1

"""

     2

i18n.py - internationalization support for mercurial

     3

     4

Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>

     5

     6

This software may be used and distributed according to the terms

     7

of the GNU General Public License, incorporated herein by reference.

     8

"""

     9

    10

import gettext

    11

t = gettext.translation('hg', fallback=1)

    12

gettext = t.gettext

    13

_ = gettext