upstream/mercurial-mirror Files · mercurial/i18n.py

Fix file-changed-to-dir and dir-to-file commits (issue660)....

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.

Matt Mackall - - Load All Authors

File last commit:

r3888:66050481 default


                r5487:7a64931e

default

Download file

             i18n.py
        
                    13 lines
            
             | 339 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / i18n.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      """

      i18n.py - internationalization support for mercurial

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

      This software may be used and distributed according to the terms

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

      """

      import gettext

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

      gettext = t.gettext

      _ = gettext

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				"""
				i18n.py - internationalization support for mercurial

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

				This software may be used and distributed according to the terms
				of the GNU General Public License, incorporated herein by reference.
				"""

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