diff -Nru mercurial-1.6.2/contrib/check-code.py mercurial-1.6.4/contrib/check-code.py --- mercurial-1.6.2/contrib/check-code.py 2010-08-02 18:29:59.000000000 +0000 +++ mercurial-1.6.4/contrib/check-code.py 2010-10-01 15:18:49.000000000 +0000 @@ -46,6 +46,7 @@ (r'^function', "don't use 'function', use old style"), (r'grep.*-q', "don't use 'grep -q', redirect to /dev/null"), (r'echo.*\\n', "don't use 'echo \\n', use printf"), + (r'echo -n', "don't use 'echo -n', use printf"), (r'^diff.*-\w*N', "don't use 'diff -N'"), (r'(^| )wc[^|]*$', "filter wc output"), (r'head -c', "don't use 'head -c', use 'dd'"), diff -Nru mercurial-1.6.2/contrib/mercurial.spec mercurial-1.6.4/contrib/mercurial.spec --- mercurial-1.6.2/contrib/mercurial.spec 2010-08-02 18:29:59.000000000 +0000 +++ mercurial-1.6.4/contrib/mercurial.spec 2010-10-01 15:18:49.000000000 +0000 @@ -1,4 +1,4 @@ -Summary: Mercurial -- a distributed SCM +Summary: A fast, lightweight Source Control Management system Name: mercurial Version: snapshot Release: 0 @@ -17,7 +17,7 @@ # python-devel provides an adequate python-dev. The merge tool is a # run-time dependency. # -BuildRequires: python >= 2.4, python-devel, make, gcc, python-docutils >= 0.5 +BuildRequires: python >= 2.4, python-devel, make, gcc, python-docutils >= 0.5, gettext Provides: hg = %{version}-%{release} Requires: python >= 2.4 # The hgk extension uses the wish tcl interpreter, but we don't enforce it @@ -40,8 +40,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=%{_mandir} -install contrib/hgk $RPM_BUILD_ROOT%{_bindir} -install contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir} +install -m 755 contrib/hgk $RPM_BUILD_ROOT%{_bindir} +install -m 755 contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir} bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d mkdir -p $bash_completion_dir @@ -52,11 +52,11 @@ install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir} -install contrib/mercurial.el $RPM_BUILD_ROOT%{emacs_lispdir} -install contrib/mq.el $RPM_BUILD_ROOT%{emacs_lispdir} +install -m 644 contrib/mercurial.el $RPM_BUILD_ROOT%{emacs_lispdir} +install -m 644 contrib/mq.el $RPM_BUILD_ROOT%{emacs_lispdir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d -install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc +install -m 644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc %clean rm -rf $RPM_BUILD_ROOT @@ -66,15 +66,17 @@ %doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.cgi contrib/*.fcgi %doc %attr(644,root,root) %{_mandir}/man?/hg* %doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc -%{_sysconfdir}/bash_completion.d/mercurial.sh +%dir %{_datadir}/zsh/ +%dir %{_datadir}/zsh/site-functions/ %{_datadir}/zsh/site-functions/_mercurial +%dir %{_datadir}/emacs/site-lisp/ %{_datadir}/emacs/site-lisp/mercurial.el %{_datadir}/emacs/site-lisp/mq.el %{_bindir}/hg %{_bindir}/hgk %{_bindir}/hg-ssh %dir %{_sysconfdir}/bash_completion.d/ -%dir %{_datadir}/zsh/site-functions/ +%config(noreplace) %{_sysconfdir}/bash_completion.d/mercurial.sh %dir %{_sysconfdir}/mercurial %dir %{_sysconfdir}/mercurial/hgrc.d %config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc diff -Nru mercurial-1.6.2/contrib/win32/mercurial.iss mercurial-1.6.4/contrib/win32/mercurial.iss --- mercurial-1.6.2/contrib/win32/mercurial.iss 2010-08-02 18:29:59.000000000 +0000 +++ mercurial-1.6.4/contrib/win32/mercurial.iss 2010-10-01 15:18:49.000000000 +0000 @@ -52,6 +52,10 @@ Source: contrib\hgk; DestDir: {app}/Contrib; DestName: hgk.tcl Source: contrib\xml.rnc; DestDir: {app}/Contrib Source: contrib\shrink-revlog.py; DestDir: {app}/Contrib +Source: contrib\mercurial.el; DestDir: {app}/Contrib +Source: contrib\mq.el; DestDir: {app}/Contrib +Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib +Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme Source: contrib\mergetools.hgrc; DestDir: {tmp}; Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; AfterInstall: ConcatenateFiles; diff -Nru mercurial-1.6.2/debian/changelog mercurial-1.6.4/debian/changelog --- mercurial-1.6.2/debian/changelog 2010-08-15 19:43:51.000000000 +0000 +++ mercurial-1.6.4/debian/changelog 2010-10-21 00:06:23.000000000 +0000 @@ -1,8 +1,30 @@ -mercurial (1.6.2-1~ppa1~lucid1) lucid; urgency=low +mercurial (1.6.4-1~ppa1~lucid1) lucid; urgency=low - * Backport to Lucid. + * Backport to Lucidbleed. - -- Nicola Ferralis Sun, 15 Aug 2010 12:43:27 -0700 + -- Nicola Ferralis Wed, 20 Oct 2010 17:05:12 -0700 + +mercurial (1.6.4-1) unstable; urgency=low + + * New upstream release 1.6.4 (Closes: #598850) + * Verify ssl validity in https connections (Closes: #598841) + + -- Javi Merino Mon, 04 Oct 2010 07:37:33 -0500 + +mercurial (1.6.3-1) experimental; urgency=low + + * New upstream release 1.6.3 + * Deleted patch from_upstream__issue2255fix-basicauth.diff which is now + included upstream. + + -- Javi Merino Tue, 31 Aug 2010 10:12:42 +0200 + +mercurial (1.6.2-2) unstable; urgency=low + + * The patch that fixed #586907 was not being applied. Now it should + work. (Closes: #586907) + + -- Javi Merino Thu, 26 Aug 2010 16:31:09 +0200 mercurial (1.6.2-1) unstable; urgency=low diff -Nru mercurial-1.6.2/debian/control mercurial-1.6.4/debian/control --- mercurial-1.6.2/debian/control 2010-07-30 16:01:19.000000000 +0000 +++ mercurial-1.6.4/debian/control 2010-10-04 12:35:49.000000000 +0000 @@ -5,6 +5,7 @@ Uploaders: Vincent Danjean , Vernon Tang , Javi Merino +DM-Upload-Allowed: yes Build-Depends: debhelper (>= 7.0.50), patchutils (>= 0.2.25), gettext, python-support (>= 0.5.3), python-all-dev (>= 2.5.4-1~), python-docutils, diff -Nru mercurial-1.6.2/debian/patches/deb_specific__optional-dependencies mercurial-1.6.4/debian/patches/deb_specific__optional-dependencies --- mercurial-1.6.2/debian/patches/deb_specific__optional-dependencies 2010-07-03 10:56:08.000000000 +0000 +++ mercurial-1.6.4/debian/patches/deb_specific__optional-dependencies 2010-10-04 12:36:43.000000000 +0000 @@ -54,7 +54,7 @@ self.files = {} --- a/hgext/convert/darcs.py +++ b/hgext/convert/darcs.py -@@ -39,14 +39,15 @@ +@@ -36,14 +36,15 @@ if not os.path.exists(os.path.join(path, '_darcs')): raise NoRepo(_("%s does not look like a darcs repository") % path) diff -Nru mercurial-1.6.2/debian/patches/deb_specific__python-module-not-script.patch mercurial-1.6.4/debian/patches/deb_specific__python-module-not-script.patch --- mercurial-1.6.2/debian/patches/deb_specific__python-module-not-script.patch 2010-05-11 09:07:56.000000000 +0000 +++ mercurial-1.6.4/debian/patches/deb_specific__python-module-not-script.patch 2010-10-04 12:36:29.000000000 +0000 @@ -10,10 +10,3 @@ import sys from _lsprof import Profiler, profiler_entry ---- a/mercurial/simplemerge.py -+++ b/mercurial/simplemerge.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # Copyright (C) 2004, 2005 Canonical Ltd - # - # This program is free software; you can redistribute it and/or modify diff -Nru mercurial-1.6.2/debian/patches/deb_specific__use_sensible-editor.patch mercurial-1.6.4/debian/patches/deb_specific__use_sensible-editor.patch --- mercurial-1.6.2/debian/patches/deb_specific__use_sensible-editor.patch 2010-08-06 09:23:30.000000000 +0000 +++ mercurial-1.6.4/debian/patches/deb_specific__use_sensible-editor.patch 2010-10-04 12:36:43.000000000 +0000 @@ -2,7 +2,7 @@ --- a/doc/hgrc.5.txt +++ b/doc/hgrc.5.txt -@@ -829,7 +829,8 @@ +@@ -831,7 +831,8 @@ ``debug`` Print debugging information. True or False. Default is False. ``editor`` @@ -25,7 +25,7 @@ EDITOR="$EDITOR -nw" --- a/mercurial/commands.py +++ b/mercurial/commands.py -@@ -1353,8 +1353,8 @@ +@@ -1356,8 +1356,8 @@ editor = ui.geteditor() cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0]) if not cmdpath: @@ -33,12 +33,12 @@ - ui.write(_(" No commit editor set and can't find vi in PATH\n")) + if editor == 'sensible-editor': + ui.write(_(" No commit editor set and can't find sensible-editor in PATH\n")) - ui.write(_(" (specify a commit editor in your .hgrc file)\n")) + ui.write(_(" (specify a commit editor in your configuration" + " file)\n")) else: - ui.write(_(" Can't find editor '%s' in PATH\n") % editor) --- a/mercurial/ui.py +++ b/mercurial/ui.py -@@ -557,7 +557,7 @@ +@@ -559,7 +559,7 @@ return (os.environ.get("HGEDITOR") or self.config("ui", "editor") or os.environ.get("VISUAL") or @@ -131,16 +131,7 @@ msgid " (specify a commit editor in your .hgrc file)\n" --- a/i18n/it.po +++ b/i18n/it.po -@@ -218,7 +218,7 @@ - " editor it uses is determined by looking at the environment\n" - " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" - " non-empty one is chosen. If all of them are empty, the editor\n" --" defaults to 'vi'." -+" defaults to 'sensible-editor'." - msgstr "" - - msgid "" -@@ -6230,8 +6230,8 @@ +@@ -6842,8 +6842,8 @@ msgid "Checking commit editor...\n" msgstr "Sto controllando l'editor per il commit...\n" @@ -151,9 +142,18 @@ msgid " (specify a commit editor in your .hgrc file)\n" msgstr " (specificare un editore per il commit nel proprio file .hgrc)\n" +@@ -10271,7 +10271,7 @@ + " editor it uses is determined by looking at the environment\n" + " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" + " non-empty one is chosen. If all of them are empty, the editor\n" +-" defaults to 'vi'." ++" defaults to 'sensible-editor'." + msgstr "" + + msgid "" --- a/i18n/ja.po +++ b/i18n/ja.po -@@ -7364,8 +7364,8 @@ +@@ -7414,8 +7414,8 @@ msgid "Checking commit editor...\n" msgstr "メッセージ入力用エディタの検証中...\n" @@ -162,9 +162,9 @@ +msgid " No commit editor set and can't find sensible-editor in PATH\n" +msgstr " エディタが起動できません(sensible-editor にも PATH が通っていません)\n" - msgid " (specify a commit editor in your .hgrc file)\n" + msgid " (specify a commit editor in your configuration file)\n" msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n" -@@ -10735,14 +10735,14 @@ +@@ -10847,14 +10847,14 @@ " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" @@ -183,7 +183,7 @@ "PYTHONPATH\n" --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po -@@ -8192,8 +8192,8 @@ +@@ -8236,8 +8236,8 @@ msgid "Checking commit editor...\n" msgstr "Verificando editor para consolidação...\n" @@ -192,9 +192,9 @@ +msgid " No commit editor set and can't find sensible-editor in PATH\n" +msgstr " Nenhum editor para consolidação configurado, e não foi possível encontrar 'sensible-editor' no PATH\n" - msgid " (specify a commit editor in your .hgrc file)\n" - msgstr " (especifique um editor para consolidação em seu arquivo .hgrc)\n" -@@ -11637,7 +11637,7 @@ + msgid " (specify a commit editor in your configuration file)\n" + msgstr " (especifique um editor para consolidação em seu arquivo de configuração)\n" +@@ -11716,7 +11716,7 @@ " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" @@ -203,7 +203,7 @@ msgstr "" "EDITOR\n" " Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n" -@@ -11645,7 +11645,7 @@ +@@ -11724,7 +11724,7 @@ " mensagens de consolidação. O editor usado é determinado pela\n" " consulta às variáveis de ambiente HGEDITOR, VISUAL e EDITOR,\n" " nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n" diff -Nru mercurial-1.6.2/debian/patches/from_upstream__issue2255fix-basicauth.diff mercurial-1.6.4/debian/patches/from_upstream__issue2255fix-basicauth.diff --- mercurial-1.6.2/debian/patches/from_upstream__issue2255fix-basicauth.diff 2010-07-28 12:01:31.000000000 +0000 +++ mercurial-1.6.4/debian/patches/from_upstream__issue2255fix-basicauth.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -Patch proposed in http://mercurial.selenic.com/bts/issue2255 to fix bug #586907 - -This file was downloaded from: -http://mercurial.selenic.com/bts/file1106/issue2255fix-basicauth.diff - -diff --git a/mercurial/url.py b/mercurial/url.py ---- a/mercurial/url.py -+++ b/mercurial/url.py -@@ -570,6 +570,25 @@ - return - raise - -+class httpbasicauthhandler(urllib2.HTTPBasicAuthHandler): -+ def __init__(self, *args, **kwargs): -+ urllib2.HTTPBasicAuthHandler.__init__(self, *args, **kwargs) -+ self.retried_req = None -+ -+ def reset_retry_count(self): -+ # Python 2.6.5 will call this on 401 or 407 errors and thus loop -+ # forever. We disable reset_retry_count completely and reset in -+ # http_error_auth_reqed instead. -+ pass -+ -+ def http_error_auth_reqed(self, auth_header, host, req, headers): -+ # Reset the retry counter once for each request. -+ if req is not self.retried_req: -+ self.retried_req = req -+ self.retried = 0 -+ return urllib2.HTTPBasicAuthHandler.http_error_auth_reqed( -+ self, auth_header, host, req, headers) -+ - def getauthinfo(path): - scheme, netloc, urlpath, query, frag = urlparse.urlsplit(path) - if not urlpath: -@@ -615,7 +634,7 @@ - ui.debug('http auth: user %s, password %s\n' % - (user, passwd and '*' * len(passwd) or 'not set')) - -- handlers.extend((urllib2.HTTPBasicAuthHandler(passmgr), -+ handlers.extend((httpbasicauthhandler(passmgr), - httpdigestauthhandler(passmgr))) - handlers.extend([h(ui, passmgr) for h in handlerfuncs]) - opener = urllib2.build_opener(*handlers) diff -Nru mercurial-1.6.2/doc/hg.1 mercurial-1.6.4/doc/hg.1 --- mercurial-1.6.2/doc/hg.1 2010-08-02 18:30:06.000000000 +0000 +++ mercurial-1.6.4/doc/hg.1 2010-10-01 15:19:00.000000000 +0000 @@ -781,8 +781,10 @@ If you are committing the result of a merge, do not provide any filenames or \-I/\-X filters. .sp -If no commit message is specified, the configured editor is -started to prompt you for a message. +If no commit message is specified, Mercurial starts your +configured editor where you can enter a message. In case your +commit fails, you will find a backup of your message in +\fB.hg/last\-message.txt\fP. .sp See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date. .sp @@ -1182,7 +1184,7 @@ .TP .B \-a, \-\-active . -show active branchheads only [DEPRECATED] +show active branchheads only (DEPRECATED) .TP .B \-c, \-\-closed . @@ -1773,8 +1775,8 @@ Show definition of symbolic path name NAME. If no name is given, show definition of all available names. .sp -Path names are defined in the [paths] section of -\fB/etc/mercurial/hgrc\fP and \fB$HOME/.hgrc\fP. If run inside a +Path names are defined in the [paths] section of your +configuration file and in \fB/etc/mercurial/hgrc\fP. If run inside a repository, \fB.hg/hgrc\fP is used, too. .sp The path names \fBdefault\fP and \fBdefault\-push\fP have a special @@ -2013,42 +2015,39 @@ .TP .B \fBresolve [OPTION]... [FILE]...\fP .sp -This command includes several actions that are often useful while -performing a merge, after running \fBmerge\fP but before running -\fBcommit\fP. (It is only meaningful if your working directory has -two parents.) It is most relevant for merges with unresolved -conflicts, which are typically a result of non\-interactive merging with -\fBinternal:merge\fP or a command\-line merge tool like \fBdiff3\fP. +Merges with unresolved conflicts are often the result of +non\-interactive merging using the \fBinternal:merge\fP configuration +setting, or a command\-line merge tool like \fBdiff3\fP. The resolve +command is used to manage the files involved in a merge, after +\%\fBhg merge\fP\: has been run, and before \%\fBhg commit\fP\: is run (i.e. the +working directory must have two parents). .sp -The available actions are: +The resolve command can be used in the following ways: .INDENT 7.0 -.INDENT 3.5 -.INDENT 0.0 -.IP 1. 3 +.IP \(bu 2 . -list files that were merged with conflicts (U, for unresolved) -and without conflicts (R, for resolved): \fBhg resolve \-l\fP -(this is like \fBstatus\fP for merges) -.IP 2. 3 +\%\fBhg resolve FILE...\fP\:: attempt to re\-merge the specified files, +discarding any previous merge attempts. Re\-merging is not +performed for files already marked as resolved. Use \fB\-\-all/\-a\fP +to selects all unresolved files. +.IP \(bu 2 . -record that you have resolved conflicts in certain files: -\fBhg resolve \-m [file ...]\fP (default: mark all unresolved files) -.IP 3. 3 +\%\fBhg resolve \-m [FILE]\fP\:: mark a file as having been resolved +(e.g. after having manually fixed\-up the files). The default is +to mark all unresolved files. +.IP \(bu 2 . -forget that you have resolved conflicts in certain files: -\fBhg resolve \-u [file ...]\fP (default: unmark all resolved files) -.IP 4. 3 +\%\fBhg resolve \-u [FILE]...\fP\:: mark a file as unresolved. The +default is to mark all resolved files. +.IP \(bu 2 . -discard your current attempt(s) at resolving conflicts and -restart the merge from scratch: \fBhg resolve file...\fP -(or \fB\-a\fP for all unresolved files) -.UNINDENT -.UNINDENT +\%\fBhg resolve \-l\fP\:: list files which had or still have conflicts. +In the printed list, \fBU\fP = unresolved and \fBR\fP = resolved. .UNINDENT .sp -Note that Mercurial will not let you commit files with unresolved merge -conflicts. You must use \fBhg resolve \-m ...\fP before you can commit -after a conflicting merge. +Note that Mercurial will not let you commit files with unresolved +merge conflicts. You must use \%\fBhg resolve \-m ...\fP\: before you can +commit after a conflicting merge. .sp Returns 0 on success, 1 if any files fail a resolve attempt. .sp @@ -2069,7 +2068,7 @@ .TP .B \-u, \-\-unmark . -unmark files as resolved +mark files as unresolved .TP .B \-n, \-\-no\-status . @@ -2925,7 +2924,7 @@ . This is the name of the editor to run when committing. See EDITOR. .sp -(deprecated, use .hgrc) +(deprecated, use configuration file) .TP .B HGENCODING . @@ -2949,14 +2948,14 @@ will be executed with three arguments: local file, remote file, ancestor file. .sp -(deprecated, use .hgrc) +(deprecated, use configuration file) .TP .B HGRCPATH . -A list of files or directories to search for hgrc files. Item -separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set, -platform default search path is used. If empty, only the .hg/hgrc -from the current repository is read. +A list of files or directories to search for configuration +files. Item separator is ":" on Unix, ";" on Windows. If HGRCPATH +is not set, platform default search path is used. If empty, only +the .hg/hgrc from the current repository is read. .sp For each element in HGRCPATH: .INDENT 7.0 @@ -2970,9 +2969,9 @@ .TP .B HGPLAIN . -When set, this disables any options in .hgrc that might change -Mercurial\(aqs default output. This includes encoding, defaults, -verbose mode, debug mode, quiet mode, tracebacks, and +When set, this disables any configuration settings that might +change Mercurial\(aqs default output. This includes encoding, +defaults, verbose mode, debug mode, quiet mode, tracebacks, and localization. This can be useful when scripting against Mercurial in the face of existing user configuration. .sp @@ -2989,7 +2988,7 @@ HGUSER (deprecated) .IP \(bu 2 . -hgrc files from the HGRCPATH +configuration files from the HGRCPATH .IP \(bu 2 . EMAIL @@ -3001,7 +3000,7 @@ LOGNAME (with \fB@hostname\fP appended) .UNINDENT .sp -(deprecated, use .hgrc) +(deprecated, use configuration file) .TP .B EMAIL . @@ -3343,8 +3342,8 @@ .sp To make Mercurial produce the git extended diff format, use the \-\-git option available for many commands, or set \(aqgit = True\(aq in the [diff] -section of your hgrc. You do not need to set this option when -importing diffs in this format or using them in the mq extension. +section of your configuration file. You do not need to set this option +when importing diffs in this format or using them in the mq extension. .SH TEMPLATE USAGE .sp Mercurial allows you to customize output of commands through @@ -3582,6 +3581,11 @@ . Date. Returns a date like "2006\-09\-18". .TP +.B stringify +. +Any type. Turns the value into text by converting values into +text and concatenating them. +.TP .B strip . Any text. Strips all leading and trailing whitespace. @@ -3626,6 +3630,9 @@ possible if the feature is explicitly enabled on the remote Mercurial server. .sp +Note that the security of HTTPS URLs depends on proper configuration of +web.cacerts. +.sp Some notes about using SSH with Mercurial: .INDENT 0.0 .IP \(bu 2 @@ -3656,12 +3663,12 @@ .ft P .fi .sp -Alternatively specify "ssh \-C" as your ssh command in your hgrc or -with the \-\-ssh command line option. +Alternatively specify "ssh \-C" as your ssh command in your +configuration file or with the \-\-ssh command line option. .UNINDENT .sp -These URLs can all be stored in your hgrc with path aliases under the -[paths] section like so: +These URLs can all be stored in your configuration file with path +aliases under the [paths] section like so: .sp .nf .ft C @@ -3706,9 +3713,9 @@ Mercurial. It is thus up to the user to activate extensions as needed. .sp -To enable the "foo" extension, either shipped with Mercurial or in -the Python search path, create an entry for it in your hgrc, like -this: +To enable the "foo" extension, either shipped with Mercurial or in the +Python search path, create an entry for it in your configuration file, +like this: .sp .nf .ft C @@ -3726,8 +3733,8 @@ .ft P .fi .sp -To explicitly disable an extension enabled in an hgrc of broader -scope, prepend its path with !: +To explicitly disable an extension enabled in a configuration file of +broader scope, prepend its path with !: .sp .nf .ft C @@ -4011,6 +4018,18 @@ . See \(aqHead, branch\(aq. .TP +.B Branch, inactive +. +If a named branch has no topological heads, it is considered to be +inactive. As an example, a feature branch becomes inactive when it +is merged into the default branch. The \%\fBhg branches\fP\: command +shows inactive branches by default, though they can be hidden with +\%\fBhg branches \-\-active\fP\:. +.sp +NOTE: this concept is deprecated because it is too implicit. +Branches should now be explicitly closed using \%\fBhg commit +\-\-close\-branch\fP\: when they are no longer needed. +.TP .B Branch, named . A collection of changesets which have the same branch name. By diff -Nru mercurial-1.6.2/doc/hg.1.gendoc.txt mercurial-1.6.4/doc/hg.1.gendoc.txt --- mercurial-1.6.2/doc/hg.1.gendoc.txt 2010-08-02 18:30:04.000000000 +0000 +++ mercurial-1.6.4/doc/hg.1.gendoc.txt 2010-10-01 15:18:57.000000000 +0000 @@ -436,8 +436,10 @@ If you are committing the result of a merge, do not provide any filenames or -I/-X filters. - If no commit message is specified, the configured editor is - started to prompt you for a message. + If no commit message is specified, Mercurial starts your + configured editor where you can enter a message. In case your + commit fails, you will find a backup of your message in + ``.hg/last-message.txt``. See :hg:`help dates` for a list of formats valid for -d/--date. @@ -653,7 +655,7 @@ -r, --rev show only heads which are descendants of REV -t, --topo show topological heads only - -a, --active show active branchheads only [DEPRECATED] + -a, --active show active branchheads only (DEPRECATED) -c, --closed show normal and closed branch heads --style display using template map file --template display with template @@ -978,8 +980,8 @@ Show definition of symbolic path name NAME. If no name is given, show definition of all available names. - Path names are defined in the [paths] section of - ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a + Path names are defined in the [paths] section of your + configuration file and in ``/etc/mercurial/hgrc``. If run inside a repository, ``.hg/hgrc`` is used, too. The path names ``default`` and ``default-push`` have a special @@ -1141,29 +1143,33 @@ .. _resolve: ``resolve [OPTION]... [FILE]...`` - This command includes several actions that are often useful while - performing a merge, after running ``merge`` but before running - ``commit``. (It is only meaningful if your working directory has - two parents.) It is most relevant for merges with unresolved - conflicts, which are typically a result of non-interactive merging with - ``internal:merge`` or a command-line merge tool like ``diff3``. - - The available actions are: - - 1) list files that were merged with conflicts (U, for unresolved) - and without conflicts (R, for resolved): ``hg resolve -l`` - (this is like ``status`` for merges) - 2) record that you have resolved conflicts in certain files: - ``hg resolve -m [file ...]`` (default: mark all unresolved files) - 3) forget that you have resolved conflicts in certain files: - ``hg resolve -u [file ...]`` (default: unmark all resolved files) - 4) discard your current attempt(s) at resolving conflicts and - restart the merge from scratch: ``hg resolve file...`` - (or ``-a`` for all unresolved files) - - Note that Mercurial will not let you commit files with unresolved merge - conflicts. You must use ``hg resolve -m ...`` before you can commit - after a conflicting merge. + Merges with unresolved conflicts are often the result of + non-interactive merging using the ``internal:merge`` configuration + setting, or a command-line merge tool like ``diff3``. The resolve + command is used to manage the files involved in a merge, after + :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the + working directory must have two parents). + + The resolve command can be used in the following ways: + + - :hg:`resolve FILE...`: attempt to re-merge the specified files, + discarding any previous merge attempts. Re-merging is not + performed for files already marked as resolved. Use ``--all/-a`` + to selects all unresolved files. + + - :hg:`resolve -m [FILE]`: mark a file as having been resolved + (e.g. after having manually fixed-up the files). The default is + to mark all unresolved files. + + - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The + default is to mark all resolved files. + + - :hg:`resolve -l`: list files which had or still have conflicts. + In the printed list, ``U`` = unresolved and ``R`` = resolved. + + Note that Mercurial will not let you commit files with unresolved + merge conflicts. You must use :hg:`resolve -m ...` before you can + commit after a conflicting merge. Returns 0 on success, 1 if any files fail a resolve attempt. @@ -1172,7 +1178,7 @@ -a, --all select all unresolved files -l, --list list state of files needing merge -m, --mark mark files as resolved - -u, --unmark unmark files as resolved + -u, --unmark mark files as unresolved -n, --no-status hide status prefix -I, --include include names matching the given patterns -X, --exclude exclude names matching the given patterns @@ -1544,6 +1550,7 @@ output version and copyright information .. _config: +.. _hgrc: Configuration Files ------------------- @@ -1705,7 +1712,7 @@ HGEDITOR This is the name of the editor to run when committing. See EDITOR. - (deprecated, use .hgrc) + (deprecated, use configuration file) HGENCODING This overrides the default locale setting detected by Mercurial. @@ -1726,13 +1733,13 @@ will be executed with three arguments: local file, remote file, ancestor file. - (deprecated, use .hgrc) + (deprecated, use configuration file) HGRCPATH - A list of files or directories to search for hgrc files. Item - separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set, - platform default search path is used. If empty, only the .hg/hgrc - from the current repository is read. + A list of files or directories to search for configuration + files. Item separator is ":" on Unix, ";" on Windows. If HGRCPATH + is not set, platform default search path is used. If empty, only + the .hg/hgrc from the current repository is read. For each element in HGRCPATH: @@ -1740,9 +1747,9 @@ - otherwise, the file itself will be added HGPLAIN - When set, this disables any options in .hgrc that might change - Mercurial's default output. This includes encoding, defaults, - verbose mode, debug mode, quiet mode, tracebacks, and + When set, this disables any configuration settings that might + change Mercurial's default output. This includes encoding, + defaults, verbose mode, debug mode, quiet mode, tracebacks, and localization. This can be useful when scripting against Mercurial in the face of existing user configuration. @@ -1754,12 +1761,12 @@ available values will be considered in this order: - HGUSER (deprecated) - - hgrc files from the HGRCPATH + - configuration files from the HGRCPATH - EMAIL - interactive prompt - LOGNAME (with ``@hostname`` appended) - (deprecated, use .hgrc) + (deprecated, use configuration file) EMAIL May be used as the author of a commit; see HGUSER. @@ -2042,8 +2049,8 @@ To make Mercurial produce the git extended diff format, use the --git option available for many commands, or set 'git = True' in the [diff] -section of your hgrc. You do not need to set this option when -importing diffs in this format or using them in the mq extension. +section of your configuration file. You do not need to set this option +when importing diffs in this format or using them in the mq extension. .. _templating: .. _templates: @@ -2193,6 +2200,9 @@ :shortdate: Date. Returns a date like "2006-09-18". +:stringify: Any type. Turns the value into text by converting values into + text and concatenating them. + :strip: Any text. Strips all leading and trailing whitespace. :tabindent: Any text. Returns the text, with every line except the @@ -2228,6 +2238,9 @@ possible if the feature is explicitly enabled on the remote Mercurial server. +Note that the security of HTTPS URLs depends on proper configuration of +web.cacerts. + Some notes about using SSH with Mercurial: - SSH requires an accessible shell account on the destination machine @@ -2245,11 +2258,11 @@ Host * Compression yes - Alternatively specify "ssh -C" as your ssh command in your hgrc or - with the --ssh command line option. + Alternatively specify "ssh -C" as your ssh command in your + configuration file or with the --ssh command line option. -These URLs can all be stored in your hgrc with path aliases under the -[paths] section like so:: +These URLs can all be stored in your configuration file with path +aliases under the [paths] section like so:: [paths] alias1 = URL1 @@ -2290,9 +2303,9 @@ Mercurial. It is thus up to the user to activate extensions as needed. -To enable the "foo" extension, either shipped with Mercurial or in -the Python search path, create an entry for it in your hgrc, like -this:: +To enable the "foo" extension, either shipped with Mercurial or in the +Python search path, create an entry for it in your configuration file, +like this:: [extensions] foo = @@ -2302,8 +2315,8 @@ [extensions] myfeature = ~/.hgext/myfeature.py -To explicitly disable an extension enabled in an hgrc of broader -scope, prepend its path with !:: +To explicitly disable an extension enabled in a configuration file of +broader scope, prepend its path with !:: [extensions] # disabling extension bar residing in /path/to/extension/bar.py @@ -2449,6 +2462,17 @@ Branch head See 'Head, branch'. +Branch, inactive + If a named branch has no topological heads, it is considered to be + inactive. As an example, a feature branch becomes inactive when it + is merged into the default branch. The :hg:`branches` command + shows inactive branches by default, though they can be hidden with + :hg:`branches --active`. + + NOTE: this concept is deprecated because it is too implicit. + Branches should now be explicitly closed using :hg:`commit + --close-branch` when they are no longer needed. + Branch, named A collection of changesets which have the same branch name. By default, children of a changeset in a named branch belong to the diff -Nru mercurial-1.6.2/doc/hg.1.html mercurial-1.6.4/doc/hg.1.html --- mercurial-1.6.2/doc/hg.1.html 2010-08-02 18:30:10.000000000 +0000 +++ mercurial-1.6.4/doc/hg.1.html 2010-10-01 15:19:04.000000000 +0000 @@ -675,8 +675,10 @@ will be committed.

If you are committing the result of a merge, do not provide any filenames or -I/-X filters.

-

If no commit message is specified, the configured editor is -started to prompt you for a message.

+

If no commit message is specified, Mercurial starts your +configured editor where you can enter a message. In case your +commit fails, you will find a backup of your message in +.hg/last-message.txt.

See hg help dates for a list of formats valid for -d/--date.

Returns 0 on success, 1 if nothing changed.

options:

@@ -1005,7 +1007,7 @@ show topological heads only -a, --active -show active branchheads only [DEPRECATED] +show active branchheads only (DEPRECATED) -c, --closed show normal and closed branch heads @@ -1499,8 +1501,8 @@
paths [NAME]

Show definition of symbolic path name NAME. If no name is given, show definition of all available names.

-

Path names are defined in the [paths] section of -/etc/mercurial/hgrc and $HOME/.hgrc. If run inside a +

Path names are defined in the [paths] section of your +configuration file and in /etc/mercurial/hgrc. If run inside a repository, .hg/hgrc is used, too.

The path names default and default-push have a special meaning. When performing a push or pull operation, they are used @@ -1696,30 +1698,29 @@

resolve [OPTION]... [FILE]...
-

This command includes several actions that are often useful while -performing a merge, after running merge but before running -commit. (It is only meaningful if your working directory has -two parents.) It is most relevant for merges with unresolved -conflicts, which are typically a result of non-interactive merging with -internal:merge or a command-line merge tool like diff3.

-

The available actions are:

-
-
    -
  1. list files that were merged with conflicts (U, for unresolved) -and without conflicts (R, for resolved): hg resolve -l -(this is like status for merges)
    2. -
  2. record that you have resolved conflicts in certain files: -hg resolve -m [file ...] (default: mark all unresolved files)
    3. -
  3. forget that you have resolved conflicts in certain files: -hg resolve -u [file ...] (default: unmark all resolved files)
    4. -
  4. discard your current attempt(s) at resolving conflicts and -restart the merge from scratch: hg resolve file... -(or -a for all unresolved files)
    5. -
-
-

Note that Mercurial will not let you commit files with unresolved merge -conflicts. You must use hg resolve -m ... before you can commit -after a conflicting merge.

+

Merges with unresolved conflicts are often the result of +non-interactive merging using the internal:merge configuration +setting, or a command-line merge tool like diff3. The resolve +command is used to manage the files involved in a merge, after +hg merge has been run, and before hg commit is run (i.e. the +working directory must have two parents).

+

The resolve command can be used in the following ways:

+
    +
  • hg resolve FILE...: attempt to re-merge the specified files, +discarding any previous merge attempts. Re-merging is not +performed for files already marked as resolved. Use --all/-a +to selects all unresolved files.
    • +
  • hg resolve -m [FILE]: mark a file as having been resolved +(e.g. after having manually fixed-up the files). The default is +to mark all unresolved files.
    • +
  • hg resolve -u [FILE]...: mark a file as unresolved. The +default is to mark all resolved files.
    • +
  • hg resolve -l: list files which had or still have conflicts. +In the printed list, U = unresolved and R = resolved.
    • +
+

Note that Mercurial will not let you commit files with unresolved +merge conflicts. You must use hg resolve -m ... before you can +commit after a conflicting merge.

Returns 0 on success, 1 if any files fail a resolve attempt.

options:

@@ -1737,7 +1738,7 @@ - + @@ -2233,7 +2234,7 @@
-

Configuration Files

+

Configuration Files

Mercurial reads configuration data from several files, if they exist. Below we list the most specific file first.

On Windows, these configuration files are read:

@@ -2374,7 +2375,7 @@ Windows) is searched.
HGEDITOR

This is the name of the editor to run when committing. See EDITOR.

-

(deprecated, use .hgrc)

+

(deprecated, use configuration file)

HGENCODING
This overrides the default locale setting detected by Mercurial. @@ -2392,13 +2393,13 @@

An executable to use for resolving merge conflicts. The program will be executed with three arguments: local file, remote file, ancestor file.

-

(deprecated, use .hgrc)

+

(deprecated, use configuration file)

HGRCPATH
-

A list of files or directories to search for hgrc files. Item -separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set, -platform default search path is used. If empty, only the .hg/hgrc -from the current repository is read.

+

A list of files or directories to search for configuration +files. Item separator is ":" on Unix, ";" on Windows. If HGRCPATH +is not set, platform default search path is used. If empty, only +the .hg/hgrc from the current repository is read.

For each element in HGRCPATH:

  • if it's a directory, all files ending with .rc are added
    • @@ -2406,9 +2407,9 @@
HGPLAIN
-

When set, this disables any options in .hgrc that might change -Mercurial's default output. This includes encoding, defaults, -verbose mode, debug mode, quiet mode, tracebacks, and +

When set, this disables any configuration settings that might +change Mercurial's default output. This includes encoding, +defaults, verbose mode, debug mode, quiet mode, tracebacks, and localization. This can be useful when scripting against Mercurial in the face of existing user configuration.

Equivalent options set via command line flags or environment @@ -2419,12 +2420,12 @@ available values will be considered in this order:

  • HGUSER (deprecated)
    • -
  • hgrc files from the HGRCPATH
    • +
  • configuration files from the HGRCPATH
  • EMAIL
  • interactive prompt
  • LOGNAME (with @hostname appended)
-

(deprecated, use .hgrc)

+

(deprecated, use configuration file)

EMAIL
May be used as the author of a commit; see HGUSER.
@@ -2642,8 +2643,8 @@ format for communicating changes.

To make Mercurial produce the git extended diff format, use the --git option available for many commands, or set 'git = True' in the [diff] -section of your hgrc. You do not need to set this option when -importing diffs in this format or using them in the mq extension.

+section of your configuration file. You do not need to set this option +when importing diffs in this format or using them in the mq extension.

Template Usage

@@ -2797,6 +2798,9 @@
+ +
mark files as resolved
-u, --unmarkunmark files as resolved
mark files as unresolved
-n, --no-status
shortdate:Date. Returns a date like "2006-09-18".
stringify:Any type. Turns the value into text by converting values into +text and concatenating them.
strip:Any text. Strips all leading and trailing whitespace.
tabindent:Any text. Returns the text, with every line except the @@ -2829,6 +2833,8 @@

Some features, such as pushing to http:// and https:// URLs are only possible if the feature is explicitly enabled on the remote Mercurial server.

+

Note that the security of HTTPS URLs depends on proper configuration of +web.cacerts.

Some notes about using SSH with Mercurial:

  • SSH requires an accessible shell account on the destination machine @@ -2848,12 +2854,12 @@ Host * Compression yes -

    Alternatively specify "ssh -C" as your ssh command in your hgrc or -with the --ssh command line option.

    +

    Alternatively specify "ssh -C" as your ssh command in your +configuration file or with the --ssh command line option.

-

These URLs can all be stored in your hgrc with path aliases under the -[paths] section like so:

+

These URLs can all be stored in your configuration file with path +aliases under the [paths] section like so:

 [paths]
 alias1 = URL1
@@ -2888,9 +2894,9 @@
 for prime time; or they may alter some usual behaviors of stock
 Mercurial. It is thus up to the user to activate extensions as
 needed.

-
To enable the "foo" extension, either shipped with Mercurial or in
-the Python search path, create an entry for it in your hgrc, like
-this:

+
To enable the "foo" extension, either shipped with Mercurial or in the
+Python search path, create an entry for it in your configuration file,
+like this:

 
 [extensions]
 foo =
@@ -2900,8 +2906,8 @@
 [extensions]
 myfeature = ~/.hgext/myfeature.py
 

-
To explicitly disable an extension enabled in an hgrc of broader
-scope, prepend its path with !:

+
To explicitly disable an extension enabled in a configuration file of
+broader scope, prepend its path with !:

 
 [extensions]
 # disabling extension bar residing in /path/to/extension/bar.py
@@ -3075,6 +3081,16 @@
 assigned.
 
Branch head

 
See 'Head, branch'.

+
Branch, inactive

+
If a named branch has no topological heads, it is considered to be
+inactive. As an example, a feature branch becomes inactive when it
+is merged into the default branch. The hg branches command
+shows inactive branches by default, though they can be hidden with
+hg branches --active.

+
NOTE: this concept is deprecated because it is too implicit.
+Branches should now be explicitly closed using hg commit
+--close-branch when they are no longer needed.

+

 
Branch, named

 
A collection of changesets which have the same branch name. By
 default, children of a changeset in a named branch belong to the
diff -Nru mercurial-1.6.2/doc/hgrc.5 mercurial-1.6.4/doc/hgrc.5
--- mercurial-1.6.2/doc/hgrc.5	2010-08-02 18:30:08.000000000 +0000
+++ mercurial-1.6.4/doc/hgrc.5	2010-10-01 15:19:01.000000000 +0000
@@ -317,8 +317,9 @@
 .B \fBusername\fP
 .sp
 Optional. Username to authenticate with. If not given, and the
-remote site requires basic or digest authentication, the user
-will be prompted for it.
+remote site requires basic or digest authentication, the user will
+be prompted for it. Environment variables are expanded in the
+username letting you do \fBfoo.username = $USER\fP.
 .TP
 .B \fBpassword\fP
 .sp
@@ -328,11 +329,13 @@
 .TP
 .B \fBkey\fP
 .sp
-Optional. PEM encoded client certificate key file.
+Optional. PEM encoded client certificate key file. Environment
+variables are expanded in the filename.
 .TP
 .B \fBcert\fP
 .sp
-Optional. PEM encoded client certificate chain file.
+Optional. PEM encoded client certificate chain file. Environment
+variables are expanded in the filename.
 .TP
 .B \fBschemes\fP
 .sp
@@ -402,8 +405,8 @@
 Use the \fB[defaults]\fP section to define command defaults, i.e. the
 default options/arguments to pass to the specified commands.
 .sp
-The following example makes \%\fBhg log\fP\: run in verbose mode, and \%\fBhg hg
-status\fP\: show only the modified files, by default:
+The following example makes \%\fBhg log\fP\: run in verbose mode, and
+\%\fBhg status\fP\: show only the modified files, by default:
 .sp
 .nf
 .ft C
@@ -930,15 +933,14 @@
 .TP
 .B \fBusername\fP
 .sp
-Optional. User name to authenticate to SMTP server with. If
-username is specified, password must also be specified.
+Optional. User name for authenticating with the SMTP server.
 Default: none.
 .TP
 .B \fBpassword\fP
 .sp
-Optional. Password to authenticate to SMTP server with. If
-username is specified, password must also be specified.
-Default: none.
+Optional. Password for authenticating with the SMTP server. If not
+specified, interactive sessions will prompt the user for a
+password; non\-interactive sessions will fail. Default: none.
 .TP
 .B \fBlocal_hostname\fP
 .sp
@@ -1276,8 +1278,9 @@
 .TP
 .B \fBcacerts\fP
 .sp
-Path to file containing a list of PEM encoded certificate authorities
-that may be used to verify an SSL server\(aqs identity. The form must be
+Path to file containing a list of PEM encoded certificate authority
+certificates. If specified on the client, then it will verify the identity
+of remote HTTPS servers with these certificates. The form must be
 as follows:
 .sp
 .nf
@@ -1291,8 +1294,8 @@
 .ft P
 .fi
 .sp
-This feature is only supported when using Python 2.6. If you wish to
-use it with earlier versions of Python, install the backported
+This feature is only supported when using Python 2.6 or later. If you wish
+to use it with earlier versions of Python, install the backported
 version of the ssl library that is available from
 \fBhttp://pypi.python.org\fP.
 .sp
diff -Nru mercurial-1.6.2/doc/hgrc.5.html mercurial-1.6.4/doc/hgrc.5.html
--- mercurial-1.6.2/doc/hgrc.5.html	2010-08-02 18:30:12.000000000 +0000
+++ mercurial-1.6.4/doc/hgrc.5.html	2010-10-01 15:19:05.000000000 +0000
@@ -271,16 +271,19 @@
 argument, q.v., is then subsequently consulted.

 
username

 
Optional. Username to authenticate with. If not given, and the
-remote site requires basic or digest authentication, the user
-will be prompted for it.

+remote site requires basic or digest authentication, the user will
+be prompted for it. Environment variables are expanded in the
+username letting you do foo.username = $USER.
 
password

 
Optional. Password to authenticate with. If not given, and the
 remote site requires basic or digest authentication, the user
 will be prompted for it.

 
key

-
Optional. PEM encoded client certificate key file.

+
Optional. PEM encoded client certificate key file. Environment
+variables are expanded in the filename.

 
cert

-
Optional. PEM encoded client certificate chain file.

+
Optional. PEM encoded client certificate chain file. Environment
+variables are expanded in the filename.

 
schemes

 
Optional. Space separated list of URI schemes to use this
 authentication entry with. Only used if the prefix doesn't include
@@ -338,8 +341,8 @@
 
(defaults are deprecated. Don't use them. Use aliases instead)

 
Use the [defaults] section to define command defaults, i.e. the
 default options/arguments to pass to the specified commands.

-
The following example makes hg log run in verbose mode, and hg hg
-status show only the modified files, by default:

+
The following example makes hg log run in verbose mode, and
+hg status show only the modified files, by default:

 
 [defaults]
 log = -v
@@ -722,13 +725,12 @@
 
Optional. Whether to connect to mail server using TLS. True or
 False. Default: False.

 
username

-
Optional. User name to authenticate to SMTP server with. If
-username is specified, password must also be specified.
+
Optional. User name for authenticating with the SMTP server.
 Default: none.

 
password

-
Optional. Password to authenticate to SMTP server with. If
-username is specified, password must also be specified.
-Default: none.

+
Optional. Password for authenticating with the SMTP server. If not
+specified, interactive sessions will prompt the user for a
+password; non-interactive sessions will fail. Default: none.

 
local_hostname

 
Optional. It's the hostname that the sender can use to identify
 itself to the MTA.

@@ -977,8 +979,9 @@
 third-party tools like email notification hooks can construct
 URLs. Example: http://hgserver/repos/.

 
cacerts

-
Path to file containing a list of PEM encoded certificate authorities
-that may be used to verify an SSL server's identity. The form must be
+
Path to file containing a list of PEM encoded certificate authority
+certificates. If specified on the client, then it will verify the identity
+of remote HTTPS servers with these certificates. The form must be
 as follows:

 
 -----BEGIN CERTIFICATE-----
@@ -988,8 +991,8 @@
 ... (certificate in base64 PEM encoding) ...
 -----END CERTIFICATE-----
 

-
This feature is only supported when using Python 2.6. If you wish to
-use it with earlier versions of Python, install the backported
+
This feature is only supported when using Python 2.6 or later. If you wish
+to use it with earlier versions of Python, install the backported
 version of the ssl library that is available from
 http://pypi.python.org.

 
You can use OpenSSL's CA certificate file if your platform has one.
diff -Nru mercurial-1.6.2/doc/hgrc.5.txt mercurial-1.6.4/doc/hgrc.5.txt
--- mercurial-1.6.2/doc/hgrc.5.txt	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/doc/hgrc.5.txt	2010-10-01 15:18:50.000000000 +0000
@@ -232,16 +232,19 @@
     argument, q.v., is then subsequently consulted.
 ``username``
     Optional. Username to authenticate with. If not given, and the
-    remote site requires basic or digest authentication, the user
-    will be prompted for it.
+    remote site requires basic or digest authentication, the user will
+    be prompted for it. Environment variables are expanded in the
+    username letting you do ``foo.username = $USER``.
 ``password``
     Optional. Password to authenticate with. If not given, and the
     remote site requires basic or digest authentication, the user
     will be prompted for it.
 ``key``
-    Optional. PEM encoded client certificate key file.
+    Optional. PEM encoded client certificate key file. Environment
+    variables are expanded in the filename.
 ``cert``
-    Optional. PEM encoded client certificate chain file.
+    Optional. PEM encoded client certificate chain file. Environment
+    variables are expanded in the filename.
 ``schemes``
     Optional. Space separated list of URI schemes to use this
     authentication entry with. Only used if the prefix doesn't include
@@ -307,8 +310,8 @@
 Use the ``[defaults]`` section to define command defaults, i.e. the
 default options/arguments to pass to the specified commands.
 
-The following example makes :hg:`log` run in verbose mode, and :hg:`hg
-status` show only the modified files, by default::
+The following example makes :hg:`log` run in verbose mode, and
+:hg:`status` show only the modified files, by default::
 
   [defaults]
   log = -v
@@ -696,13 +699,12 @@
     Optional. Whether to connect to mail server using TLS. True or
     False. Default: False.
 ``username``
-    Optional. User name to authenticate to SMTP server with. If
-    username is specified, password must also be specified.
+    Optional. User name for authenticating with the SMTP server.
     Default: none.
 ``password``
-    Optional. Password to authenticate to SMTP server with. If
-    username is specified, password must also be specified.
-    Default: none.
+    Optional. Password for authenticating with the SMTP server. If not
+    specified, interactive sessions will prompt the user for a
+    password; non-interactive sessions will fail. Default: none.
 ``local_hostname``
     Optional. It's the hostname that the sender can use to identify
     itself to the MTA.
@@ -949,8 +951,9 @@
     third-party tools like email notification hooks can construct
     URLs. Example: ``http://hgserver/repos/``.
 ``cacerts``
-    Path to file containing a list of PEM encoded certificate authorities
-    that may be used to verify an SSL server's identity. The form must be
+    Path to file containing a list of PEM encoded certificate authority
+    certificates. If specified on the client, then it will verify the identity
+    of remote HTTPS servers with these certificates. The form must be
     as follows::
 
         -----BEGIN CERTIFICATE-----
@@ -960,8 +963,8 @@
         ... (certificate in base64 PEM encoding) ...
         -----END CERTIFICATE-----
 
-    This feature is only supported when using Python 2.6. If you wish to
-    use it with earlier versions of Python, install the backported
+    This feature is only supported when using Python 2.6 or later. If you wish
+    to use it with earlier versions of Python, install the backported
     version of the ssl library that is available from
     ``http://pypi.python.org``.
 
diff -Nru mercurial-1.6.2/hgext/bookmarks.py mercurial-1.6.4/hgext/bookmarks.py
--- mercurial-1.6.2/hgext/bookmarks.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/bookmarks.py	2010-10-01 15:18:50.000000000 +0000
@@ -18,7 +18,7 @@
 By default, when several bookmarks point to the same changeset, they
 will all move forward together. It is possible to obtain a more
 git-like experience by adding the following configuration option to
-your .hgrc::
+your configuration file::
 
   [bookmarks]
   track.current = True
@@ -224,6 +224,7 @@
             in the .hg/bookmarks file.
             Read the file and return a (name=>nodeid) dictionary
             '''
+            self._loadingbookmarks = True
             try:
                 bookmarks = {}
                 for line in self.opener('bookmarks'):
@@ -231,6 +232,7 @@
                     bookmarks[refspec] = super(bookmark_repo, self).lookup(sha)
             except:
                 pass
+            self._loadingbookmarks = False
             return bookmarks
 
         @util.propertycache
@@ -257,8 +259,9 @@
             return super(bookmark_repo, self).rollback(*args)
 
         def lookup(self, key):
-            if key in self._bookmarks:
-                key = self._bookmarks[key]
+            if not getattr(self, '_loadingbookmarks', False):
+                if key in self._bookmarks:
+                    key = self._bookmarks[key]
             return super(bookmark_repo, self).lookup(key)
 
         def _bookmarksupdate(self, parents, node):
@@ -357,7 +360,8 @@
         def _findtags(self):
             """Merge bookmarks with normal tags"""
             (tags, tagtypes) = super(bookmark_repo, self)._findtags()
-            tags.update(self._bookmarks)
+            if not getattr(self, '_loadingbookmarks', False):
+                tags.update(self._bookmarks)
             return (tags, tagtypes)
 
         if hasattr(repo, 'invalidate'):
@@ -370,6 +374,11 @@
     repo.__class__ = bookmark_repo
 
 def listbookmarks(repo):
+    # We may try to list bookmarks on a repo type that does not
+    # support it (e.g., statichttprepository).
+    if not hasattr(repo, '_bookmarks'):
+        return {}
+
     d = {}
     for k, v in repo._bookmarks.iteritems():
         d[k] = hex(v)
@@ -442,9 +451,13 @@
             if b in repo._bookmarks:
                 ui.status(_("exporting bookmark %s\n") % b)
                 new = repo[b].hex()
-            else:
+            elif b in rb:
                 ui.status(_("deleting remote bookmark %s\n") % b)
                 new = '' # delete
+            else:
+                ui.warn(_('bookmark %s does not exist on the local '
+                          'or remote repository!\n') % b)
+                return 2
             old = rb.get(b, '')
             r = other.pushkey('bookmarks', b, old, new)
             if not r:
diff -Nru mercurial-1.6.2/hgext/churn.py mercurial-1.6.4/hgext/churn.py
--- mercurial-1.6.2/hgext/churn.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/churn.py	2010-10-01 15:18:50.000000000 +0000
@@ -129,8 +129,14 @@
         aliases = repo.wjoin('.hgchurn')
     if aliases:
         for l in open(aliases, "r"):
-            alias, actual = l.split('=' in l and '=' or None, 1)
-            amap[alias.strip()] = actual.strip()
+            try:
+                alias, actual = l.split('=' in l and '=' or None, 1)
+                amap[alias.strip()] = actual.strip()
+            except ValueError:
+                l = l.strip()
+                if l:
+                    ui.warn(_("skipping malformed alias: %s\n" % l))
+                continue
 
     rate = countrate(ui, repo, amap, *pats, **opts).items()
     if not rate:
diff -Nru mercurial-1.6.2/hgext/color.py mercurial-1.6.4/hgext/color.py
--- mercurial-1.6.2/hgext/color.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/color.py	2010-10-01 15:18:50.000000000 +0000
@@ -29,7 +29,7 @@
 function (aka ANSI escape codes). This module also provides the
 render_text function, which can be used to add effects to any text.
 
-Default effects may be overridden from the .hgrc file::
+Default effects may be overridden from your configuration file::
 
   [color]
   status.modified = blue bold underline red_background
@@ -221,7 +221,7 @@
 
     # http://msdn.microsoft.com/en-us/library/ms682088%28VS.85%29.aspx
     w32effects = {
-        'none': 0,
+        'none': -1,
         'black': 0,
         'red': FOREGROUND_RED,
         'green': FOREGROUND_GREEN,
@@ -231,7 +231,7 @@
         'cyan': FOREGROUND_BLUE | FOREGROUND_GREEN,
         'white': FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,
         'bold': FOREGROUND_INTENSITY,
-        'black_background': 0,
+        'black_background': 0x100,              # unused value > 0x0f
         'red_background': BACKGROUND_RED,
         'green_background': BACKGROUND_GREEN,
         'yellow_background': BACKGROUND_RED | BACKGROUND_GREEN,
@@ -244,6 +244,9 @@
         'inverse': COMMON_LVB_REVERSE_VIDEO,    # double-byte charsets only
     }
 
+    passthrough = set([FOREGROUND_INTENSITY, BACKGROUND_INTENSITY,
+                       COMMON_LVB_UNDERSCORE, COMMON_LVB_REVERSE_VIDEO])
+
     stdout = GetStdHandle(STD_OUTPUT_HANDLE)
     try:
         origattr = stdout.GetConsoleScreenBufferInfo()['Attributes']
@@ -256,13 +259,23 @@
 
     def win32print(text, orig, **opts):
         label = opts.get('label', '')
-        attr = 0
+        attr = origattr
+
+        def mapcolor(val, attr):
+            if val == -1:
+                return origattr
+            elif val in passthrough:
+                return attr | val
+            elif val > 0x0f:
+                return (val & 0x70) | (attr & 0x8f)
+            else:
+                return (val & 0x07) | (attr & 0xf8)
 
         # determine console attributes based on labels
         for l in label.split():
             style = _styles.get(l, '')
             for effect in style.split():
-                attr |= w32effects[effect]
+                attr = mapcolor(w32effects[effect], attr)
 
         # hack to ensure regexp finds data
         if not text.startswith('\033['):
@@ -273,9 +286,8 @@
         while m:
             for sattr in m.group(1).split(';'):
                 if sattr:
-                    val = int(sattr)
-                    attr = val and attr|val or 0
-            stdout.SetConsoleTextAttribute(attr or origattr)
+                    attr = mapcolor(int(sattr), attr)
+            stdout.SetConsoleTextAttribute(attr)
             orig(m.group(2), **opts)
             m = re.match(ansire, m.group(3))
 
diff -Nru mercurial-1.6.2/hgext/convert/cvs.py mercurial-1.6.4/hgext/convert/cvs.py
--- mercurial-1.6.2/hgext/convert/cvs.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/convert/cvs.py	2010-10-01 15:18:50.000000000 +0000
@@ -5,9 +5,9 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-import os, locale, re, socket, errno
+import os, re, socket, errno
 from cStringIO import StringIO
-from mercurial import util
+from mercurial import encoding, util
 from mercurial.i18n import _
 
 from common import NoRepo, commit, converter_source, checktool
@@ -30,7 +30,7 @@
         self.socket = None
         self.cvsroot = open(os.path.join(cvs, "Root")).read()[:-1]
         self.cvsrepo = open(os.path.join(cvs, "Repository")).read()[:-1]
-        self.encoding = locale.getpreferredencoding()
+        self.encoding = encoding.encoding
 
         self._connect()
 
diff -Nru mercurial-1.6.2/hgext/convert/darcs.py mercurial-1.6.4/hgext/convert/darcs.py
--- mercurial-1.6.2/hgext/convert/darcs.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/convert/darcs.py	2010-10-01 15:18:50.000000000 +0000
@@ -8,7 +8,7 @@
 from common import NoRepo, checktool, commandline, commit, converter_source
 from mercurial.i18n import _
 from mercurial import util
-import os, shutil, tempfile
+import os, shutil, tempfile, re
 
 # The naming drift of ElementTree is fun!
 
@@ -31,11 +31,8 @@
         converter_source.__init__(self, ui, path, rev=rev)
         commandline.__init__(self, ui, 'darcs')
 
-        # check for _darcs, ElementTree, _darcs/inventory so that we can
-        # easily skip test-convert-darcs if ElementTree is not around
-        if not os.path.exists(os.path.join(path, '_darcs', 'inventories')):
-            raise NoRepo(_("%s does not look like a darcs repository") % path)
-
+        # check for _darcs, ElementTree so that we can easily skip
+        # test-convert-darcs if ElementTree is not around
         if not os.path.exists(os.path.join(path, '_darcs')):
             raise NoRepo(_("%s does not look like a darcs repository") % path)
 
@@ -55,6 +52,15 @@
         self.parents = {}
         self.tags = {}
 
+        # Check darcs repository format
+        format = self.format()
+        if format:
+            if format in ('darcs-1.0', 'hashed'):
+                raise NoRepo(_("%s repository format is unsupported, "
+                               "please upgrade") % format)
+        else:
+            self.ui.warn(_('failed to detect repository format!'))
+
     def before(self):
         self.tmppath = tempfile.mkdtemp(
             prefix='convert-' + os.path.basename(self.path) + '-')
@@ -83,12 +89,23 @@
         shutil.rmtree(self.tmppath, ignore_errors=True)
 
     def xml(self, cmd, **kwargs):
+        # NOTE: darcs is currently encoding agnostic and will print
+        # patch metadata byte-for-byte, even in the XML changelog.
         etree = ElementTree()
         fp = self._run(cmd, **kwargs)
         etree.parse(fp)
         self.checkexit(fp.close())
         return etree.getroot()
 
+    def format(self):
+        output, status = self.run('show', 'repo', no_files=True,
+                                  repodir=self.path)
+        self.checkexit(status)
+        m = re.search(r'^\s*Format:\s*(.*)$', output, re.MULTILINE)
+        if not m:
+            return None
+        return ','.join(sorted(f.strip() for f in m.group(1).split(',')))
+
     def manifest(self):
         man = []
         output, status = self.run('show', 'files', no_directories=True,
@@ -107,8 +124,12 @@
         elt = self.changes[rev]
         date = util.strdate(elt.get('local_date'), '%a %b %d %H:%M:%S %Z %Y')
         desc = elt.findtext('name') + '\n' + elt.findtext('comment', '')
-        return commit(author=elt.get('author'), date=util.datestr(date),
-                      desc=desc.strip(), parents=self.parents[rev])
+        # etree can return unicode objects for name, comment, and author,
+        # so recode() is used to ensure str objects are emitted.
+        return commit(author=self.recode(elt.get('author')),
+                      date=util.datestr(date),
+                      desc=self.recode(desc).strip(),
+                      parents=self.parents[rev])
 
     def pull(self, rev):
         output, status = self.run('pull', self.path, all=True,
diff -Nru mercurial-1.6.2/hgext/convert/gnuarch.py mercurial-1.6.4/hgext/convert/gnuarch.py
--- mercurial-1.6.2/hgext/convert/gnuarch.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/convert/gnuarch.py	2010-10-01 15:18:50.000000000 +0000
@@ -8,8 +8,8 @@
 
 from common import NoRepo, commandline, commit, converter_source
 from mercurial.i18n import _
-from mercurial import util
-import os, shutil, tempfile, stat, locale
+from mercurial import encoding, util
+import os, shutil, tempfile, stat
 from email.Parser import Parser
 
 class gnuarch_source(converter_source, commandline):
@@ -55,7 +55,7 @@
         self.parents = {}
         self.tags = {}
         self.catlogparser = Parser()
-        self.locale = locale.getpreferredencoding()
+        self.encoding = encoding.encoding
         self.archives = []
 
     def before(self):
@@ -138,7 +138,7 @@
             raise util.Abort(_('internal calling inconsistency'))
 
         # Raise IOError if necessary (i.e. deleted files).
-        if not os.path.exists(os.path.join(self.tmppath, name)):
+        if not os.path.lexists(os.path.join(self.tmppath, name)):
             raise IOError
 
         return self._getfile(name, rev)
diff -Nru mercurial-1.6.2/hgext/convert/__init__.py mercurial-1.6.4/hgext/convert/__init__.py
--- mercurial-1.6.2/hgext/convert/__init__.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/convert/__init__.py	2010-10-01 15:18:50.000000000 +0000
@@ -40,7 +40,7 @@
     (given in a format understood by the source).
 
     If no destination directory name is specified, it defaults to the
-    basename of the source with '-hg' appended. If the destination
+    basename of the source with ``-hg`` appended. If the destination
     repository doesn't exist, it will be created.
 
     By default, all sources except Mercurial will use --branchsort.
@@ -67,14 +67,17 @@
        
 
     If the file doesn't exist, it's automatically created. It's
-    updated on each commit copied, so convert-repo can be interrupted
+    updated on each commit copied, so :hg:`convert` can be interrupted
     and can be run repeatedly to copy new commits.
 
-    The [username mapping] file is a simple text file that maps each
+    The username mapping file is a simple text file that maps each
     source commit author to a destination commit author. It is handy
     for source SCMs that use unix logins to identify authors (eg:
-    CVS). One line per author mapping and the line format is:
-    srcauthor=whatever string you want
+    CVS). One line per author mapping and the line format is::
+
+      source author = destination author
+
+    Empty lines and lines starting with a ``#`` are ignored.
 
     The filemap is a file that allows filtering and remapping of files
     and directories. Each line can contain one of the following
@@ -86,25 +89,29 @@
 
       rename path/to/source path/to/destination
 
-    Comment lines start with '#'. A specificed path matches if it
+    Comment lines start with ``#``. A specificed path matches if it
     equals the full relative name of a file or one of its parent
-    directories. The 'include' or 'exclude' directive with the longest
-    matching path applies, so line order does not matter.
+    directories. The ``include`` or ``exclude`` directive with the
+    longest matching path applies, so line order does not matter.
 
-    The 'include' directive causes a file, or all files under a
+    The ``include`` directive causes a file, or all files under a
     directory, to be included in the destination repository, and the
     exclusion of all other files and directories not explicitly
-    included. The 'exclude' directive causes files or directories to
-    be omitted. The 'rename' directive renames a file or directory if
+    included. The ``exclude`` directive causes files or directories to
+    be omitted. The ``rename`` directive renames a file or directory if
     is converted. To rename from a subdirectory into the root of the
-    repository, use '.' as the path to rename to.
+    repository, use ``.`` as the path to rename to.
 
     The splicemap is a file that allows insertion of synthetic
     history, letting you specify the parents of a revision. This is
     useful if you want to e.g. give a Subversion merge two parents, or
     graft two disconnected series of history together. Each entry
     contains a key, followed by a space, followed by one or two
-    comma-separated values. The key is the revision ID in the source
+    comma-separated values::
+
+      key parent1, parent2
+
+    The key is the revision ID in the source
     revision control system whose parents should be modified (same
     format as a key in .hg/shamap). The values are the revision IDs
     (in either the source or destination revision control system) that
@@ -118,11 +125,15 @@
     conjunction with a splicemap, it allows for a powerful combination
     to help fix even the most badly mismanaged repositories and turn them
     into nicely structured Mercurial repositories. The branchmap contains
-    lines of the form "original_branch_name new_branch_name".
-    "original_branch_name" is the name of the branch in the source
-    repository, and "new_branch_name" is the name of the branch is the
-    destination repository. This can be used to (for instance) move code
-    in one repository from "default" to a named branch.
+    lines of the form::
+
+      original_branch_name new_branch_name
+
+    where "original_branch_name" is the name of the branch in the
+    source repository, and "new_branch_name" is the name of the branch
+    is the destination repository. No whitespace is allowed in the
+    branch names. This can be used to (for instance) move code in one
+    repository from "default" to a named branch.
 
     Mercurial Source
     ----------------
diff -Nru mercurial-1.6.2/hgext/convert/subversion.py mercurial-1.6.4/hgext/convert/subversion.py
--- mercurial-1.6.2/hgext/convert/subversion.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/convert/subversion.py	2010-10-01 15:18:50.000000000 +0000
@@ -1037,7 +1037,7 @@
         # our copyfile method expects to record a copy that has
         # already occurred.  Cross the semantic gap.
         wdest = self.wjoin(dest)
-        exists = os.path.exists(wdest)
+        exists = os.path.lexists(wdest)
         if exists:
             fd, tempname = tempfile.mkstemp(
                 prefix='hg-copy-', dir=os.path.dirname(wdest))
@@ -1157,4 +1157,5 @@
             os.unlink(messagefile)
 
     def puttags(self, tags):
-        self.ui.warn(_('XXX TAGS NOT IMPLEMENTED YET\n'))
+        self.ui.warn(_('writing Subversion tags is not yet implemented\n'))
+        return None, None
diff -Nru mercurial-1.6.2/hgext/eol.py mercurial-1.6.4/hgext/eol.py
--- mercurial-1.6.2/hgext/eol.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/eol.py	2010-10-01 15:18:50.000000000 +0000
@@ -145,6 +145,7 @@
 
 
 def reposetup(ui, repo):
+    uisetup(repo.ui)
     #print "reposetup for", repo.root
 
     if not repo.local():
diff -Nru mercurial-1.6.2/hgext/gpg.py mercurial-1.6.4/hgext/gpg.py
--- mercurial-1.6.2/hgext/gpg.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/gpg.py	2010-10-01 15:18:50.000000000 +0000
@@ -227,7 +227,7 @@
         data = node2txt(repo, n, sigver)
         sig = mygpg.sign(data)
         if not sig:
-            raise util.Abort(_("Error while signing"))
+            raise util.abort(_("error while signing"))
         sig = binascii.b2a_base64(sig)
         sig = sig.replace("\n", "")
         sigmessage += "%s %s %s\n" % (hexnode, sigver, sig)
diff -Nru mercurial-1.6.2/hgext/graphlog.py mercurial-1.6.4/hgext/graphlog.py
--- mercurial-1.6.2/hgext/graphlog.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/graphlog.py	2010-10-01 15:18:50.000000000 +0000
@@ -217,8 +217,8 @@
 
 def check_unsupported_flags(opts):
     for op in ["follow", "follow_first", "date", "copies", "keyword", "remove",
-               "only_merges", "user", "only_branch", "prune", "newest_first",
-               "no_merges", "include", "exclude"]:
+               "only_merges", "user", "branch", "only_branch", "prune",
+               "newest_first", "no_merges", "include", "exclude"]:
         if op in opts and opts[op]:
             raise util.Abort(_("--graph option is incompatible with --%s")
                              % op.replace("_", "-"))
diff -Nru mercurial-1.6.2/hgext/hgk.py mercurial-1.6.4/hgext/hgk.py
--- mercurial-1.6.2/hgext/hgk.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/hgk.py	2010-10-01 15:18:50.000000000 +0000
@@ -19,7 +19,7 @@
 
 The :hg:`view` command will launch the hgk Tcl script. For this command
 to work, hgk must be in your search path. Alternately, you can specify
-the path to hgk in your .hgrc file::
+the path to hgk in your configuration file::
 
   [hgk]
   path=/location/of/hgk
diff -Nru mercurial-1.6.2/hgext/keyword.py mercurial-1.6.4/hgext/keyword.py
--- mercurial-1.6.2/hgext/keyword.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/keyword.py	2010-10-01 15:18:50.000000000 +0000
@@ -35,6 +35,9 @@
 change history. The mechanism can be regarded as a convenience for the
 current user or for archive distribution.
 
+Keywords expand to the changeset data pertaining to the latest change
+relative to the working directory parent of each file.
+
 Configuration is done in the [keyword], [keywordset] and [keywordmaps]
 sections of hgrc files.
 
diff -Nru mercurial-1.6.2/hgext/mq.py mercurial-1.6.4/hgext/mq.py
--- mercurial-1.6.2/hgext/mq.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/mq.py	2010-10-01 15:18:50.000000000 +0000
@@ -674,7 +674,7 @@
                 removed = []
                 merged = []
                 for f in files:
-                    if os.path.exists(repo.wjoin(f)):
+                    if os.path.lexists(repo.wjoin(f)):
                         merged.append(f)
                     else:
                         removed.append(f)
@@ -1487,8 +1487,11 @@
             return True
 
     def qrepo(self, create=False):
+        ui = self.ui.copy()
+        ui.setconfig('paths', 'default', '', overlay=False)
+        ui.setconfig('paths', 'default-push', '', overlay=False)
         if create or os.path.isdir(self.join(".hg")):
-            return hg.repository(self.ui, path=self.path, create=create)
+            return hg.repository(ui, path=self.path, create=create)
 
     def restore(self, repo, rev, delete=None, qupdate=None):
         desc = repo[rev].description().strip()
@@ -2080,7 +2083,7 @@
     if not files:
         raise util.Abort(_('qfold requires at least one patch name'))
     if not q.check_toppatch(repo)[0]:
-        raise util.Abort(_('No patches applied'))
+        raise util.Abort(_('no patches applied'))
     q.check_localchanges(repo)
 
     message = cmdutil.logmessage(opts)
@@ -2107,7 +2110,7 @@
         pf = q.join(p)
         (patchsuccess, files, fuzz) = q.patch(repo, pf)
         if not patchsuccess:
-            raise util.Abort(_('Error folding patch %s') % p)
+            raise util.Abort(_('error folding patch %s') % p)
         patch.updatedir(ui, repo, files)
 
     if not message:
@@ -2341,7 +2344,7 @@
 def restore(ui, repo, rev, **opts):
     """restore the queue state saved by a revision (DEPRECATED)
 
-    This command is deprecated, use rebase --mq instead."""
+    This command is deprecated, use :hg:`rebase` instead."""
     rev = repo.lookup(rev)
     q = repo.mq
     q.restore(repo, rev, delete=opts['delete'],
@@ -2352,7 +2355,7 @@
 def save(ui, repo, **opts):
     """save current queue state (DEPRECATED)
 
-    This command is deprecated, use rebase --mq instead."""
+    This command is deprecated, use :hg:`rebase` instead."""
     q = repo.mq
     message = cmdutil.logmessage(opts)
     ret = q.save(repo, msg=message)
@@ -2710,8 +2713,16 @@
                                               editor, extra)
 
         def push(self, remote, force=False, revs=None, newbranch=False):
-            if self.mq.applied and not force and not revs:
-                raise util.Abort(_('source has mq patches applied'))
+            if self.mq.applied and not force:
+                haspatches = True
+                if revs:
+                    # Assume applied patches have no non-patch descendants
+                    # and are not on remote already. If they appear in the
+                    # set of resolved 'revs', bail out.
+                    applied = set(e.node for e in self.mq.applied)
+                    haspatches = bool([n for n in revs if n in applied])
+                if haspatches:
+                    raise util.Abort(_('source has mq patches applied'))
             return super(mqrepo, self).push(remote, force, revs, newbranch)
 
         def _findtags(self):
@@ -2796,7 +2807,7 @@
     else:
         repopath = cmdutil.findrepo(os.getcwd())
         if not repopath:
-            raise util.Abort(_('There is no Mercurial repository here '
+            raise util.Abort(_('there is no Mercurial repository here '
                                '(.hg not found)'))
     repo = hg.repository(ui, repopath)
     return qinit(ui, repo, True)
@@ -2941,7 +2952,7 @@
           ('n', 'name', '',
            _('merge queue name (DEPRECATED)'), _('NAME')),
           ('', 'move', None, _('reorder patch series and apply only the patch'))],
-         _('hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]')),
+         _('hg qpush [-f] [-l] [-a] [-n NAME] [--move] [PATCH | INDEX]')),
     "^qrefresh":
         (refresh,
          [('e', 'edit', None, _('edit commit message')),
diff -Nru mercurial-1.6.2/hgext/pager.py mercurial-1.6.4/hgext/pager.py
--- mercurial-1.6.2/hgext/pager.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/pager.py	2010-10-01 15:18:50.000000000 +0000
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 #
-# To load the extension, add it to your .hgrc file:
+# To load the extension, add it to your configuration file:
 #
 #   [extension]
 #   pager =
@@ -46,7 +46,7 @@
 If pager.attend is present, pager.ignore will be ignored.
 
 To ignore global commands like :hg:`version` or :hg:`help`, you have
-to specify them in the global .hgrc
+to specify them in your user configuration file.
 '''
 
 import sys, os, signal, shlex, errno
diff -Nru mercurial-1.6.2/hgext/rebase.py mercurial-1.6.4/hgext/rebase.py
--- mercurial-1.6.2/hgext/rebase.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/rebase.py	2010-10-01 15:18:50.000000000 +0000
@@ -110,7 +110,7 @@
                 raise util.Abort(
                     _('abort and continue do not allow specifying revisions'))
 
-            (originalwd, target, state, collapsef, keepf,
+            (originalwd, target, state, skipped, collapsef, keepf,
                                 keepbranchesf, external) = restorestatus(repo)
             if abortf:
                 return abort(repo, originalwd, target, state)
@@ -413,8 +413,18 @@
             else:
                 oldrev, newrev = l.split(':')
                 state[repo[oldrev].rev()] = repo[newrev].rev()
+        skipped = set()
+        # recompute the set of skipped revs
+        if not collapse:
+            seen = set([target])
+            for old, new in sorted(state.items()):
+                if new != nullrev and new in seen:
+                    skipped.add(old)
+                seen.add(new)
+        repo.ui.debug('computed skipped revs: %s\n' % skipped)
         repo.ui.debug('rebase status resumed\n')
-        return originalwd, target, state, collapse, keep, keepbranches, external
+        return (originalwd, target, state, skipped,
+                collapse, keep, keepbranches, external)
     except IOError, err:
         if err.errno != errno.ENOENT:
             raise
diff -Nru mercurial-1.6.2/hgext/transplant.py mercurial-1.6.4/hgext/transplant.py
--- mercurial-1.6.2/hgext/transplant.py	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/hgext/transplant.py	2010-10-01 15:18:50.000000000 +0000
@@ -234,7 +234,7 @@
                 p2 = node
                 self.log(user, date, message, p1, p2, merge=merge)
                 self.ui.write(str(inst) + '\n')
-                raise util.Abort(_('Fix up the merge and run '
+                raise util.Abort(_('fix up the merge and run '
                                    'hg transplant --continue'))
         else:
             files = None
diff -Nru mercurial-1.6.2/.hgsigs mercurial-1.6.4/.hgsigs
--- mercurial-1.6.2/.hgsigs	2010-08-02 18:30:04.000000000 +0000
+++ mercurial-1.6.4/.hgsigs	2010-10-01 15:18:57.000000000 +0000
@@ -25,3 +25,5 @@
 24fe2629c6fd0c74c90bd066e77387c2b02e8437 0 iEYEABECAAYFAkwFLRsACgkQywK+sNU5EO+pJACgp13tPI+pbwKZV+LeMjcQ4H6tCZYAoJebzhd6a8yYx6qiwpJxA9BXZNXy
 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 0 iEYEABECAAYFAkwsyxcACgkQywK+sNU5EO+crACfUpNAF57PmClkSri9nJcBjb2goN4AniPCNaKvnki7TnUsi1u2oxltpKKL
 bf1774d95bde614af3956d92b20e2a0c68c5fec7 0 iEYEABECAAYFAkxVwccACgkQywK+sNU5EO+oFQCeJzwZ+we1fIIyBGCddHceOUAN++cAnjvT6A8ZWW0zV21NXIFF1qQmjxJd
+c00f03a4982e467fb6b6bd45908767db6df4771d 0 iEYEABECAAYFAkxXDqsACgkQywK+sNU5EO/GJACfT9Rz4hZOxPQEs91JwtmfjevO84gAmwSmtfo5mmWSm8gtTUebCcdTv0Kf
+ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 0 iD8DBQBMdo+qywK+sNU5EO8RAqQpAJ975BL2CCAiWMz9SXthNQ9xG181IwCgp4O+KViHPkufZVFn2aTKMNvcr1A=
diff -Nru mercurial-1.6.2/.hgtags mercurial-1.6.4/.hgtags
--- mercurial-1.6.2/.hgtags	2010-08-02 18:30:04.000000000 +0000
+++ mercurial-1.6.4/.hgtags	2010-10-01 15:18:57.000000000 +0000
@@ -37,3 +37,5 @@
 24fe2629c6fd0c74c90bd066e77387c2b02e8437 1.5.4
 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 1.6
 bf1774d95bde614af3956d92b20e2a0c68c5fec7 1.6.1
+c00f03a4982e467fb6b6bd45908767db6df4771d 1.6.2
+ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 1.6.3
diff -Nru mercurial-1.6.2/i18n/it.po mercurial-1.6.4/i18n/it.po
--- mercurial-1.6.2/i18n/it.po	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/i18n/it.po	2010-10-01 15:18:50.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 12:38+0100\n"
+"POT-Creation-Date: 2010-08-12 18:06+0200\n"
 "PO-Revision-Date: 2009-10-25 12:45+0100\n"
 "Last-Translator: Stefano Tortarolo \n"
 "Language-Team: Italian \n"
@@ -18,1364 +18,1017 @@
 msgid " (default: %s)"
 msgstr " (default: %s)"
 
-msgid "OPTIONS"
-msgstr "OPZIONI"
+msgid "Options"
+msgstr "Opzioni"
 
-msgid "COMMANDS"
-msgstr "COMANDI"
+msgid "Commands"
+msgstr "Comandi"
 
-#, fuzzy
 msgid "    options:"
-msgstr "    opzioni:\n"
+msgstr "    opzioni:"
 
 #, python-format
 msgid "    aliases: %s"
 msgstr "    alias: %s"
 
-msgid "Some commands allow the user to specify a date, e.g.:"
+msgid "hooks for controlling repository access"
 msgstr ""
 
 msgid ""
-"- backout, commit, import, tag: Specify the commit date.\n"
-"- log, revert, update: Select revision(s) by date."
-msgstr ""
-
-msgid "Many date formats are valid. Here are some examples::"
+"This hook makes it possible to allow or deny write access to given\n"
+"branches and paths of a repository when receiving incoming changesets\n"
+"via pretxnchangegroup and pretxncommit."
 msgstr ""
 
 msgid ""
-"  \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
-"  \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
-"  \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
-"  \"Dec 6\" (midnight)\n"
-"  \"13:18\" (today assumed)\n"
-"  \"3:39\" (3:39AM assumed)\n"
-"  \"3:39pm\" (15:39)\n"
-"  \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-"  \"2006-12-6 13:18\"\n"
-"  \"2006-12-6\"\n"
-"  \"12-6\"\n"
-"  \"12/6\"\n"
-"  \"12/6/6\" (Dec 6 2006)"
+"The authorization is matched based on the local user name on the\n"
+"system where the hook runs, and not the committer of the original\n"
+"changeset (since the latter is merely informative)."
 msgstr ""
 
-msgid "Lastly, there is Mercurial's internal format::"
+msgid ""
+"The acl hook is best used along with a restricted shell like hgsh,\n"
+"preventing authenticating users from doing anything other than pushing\n"
+"or pulling. The hook is not safe to use if users have interactive\n"
+"shell access, as they can then disable the hook. Nor is it safe if\n"
+"remote users share an account, because then there is no way to\n"
+"distinguish them."
 msgstr ""
 
-msgid "  \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)"
+msgid "The order in which access checks are performed is:"
 msgstr ""
 
 msgid ""
-"This is the internal representation format for dates. unixtime is the\n"
-"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
-"the offset of the local timezone, in seconds west of UTC (negative if\n"
-"the timezone is east of UTC)."
+"1) Deny  list for branches (section ``acl.deny.branches``)\n"
+"2) Allow list for branches (section ``acl.allow.branches``)\n"
+"3) Deny  list for paths    (section ``acl.deny``)\n"
+"4) Allow list for paths    (section ``acl.allow``)"
 msgstr ""
 
-msgid "The log command also accepts date ranges::"
+msgid "The allow and deny sections take key-value pairs."
 msgstr ""
 
 msgid ""
-"  \"<{datetime}\" - at or before a given date/time\n"
-"  \">{datetime}\" - on or after a given date/time\n"
-"  \"{datetime} to {datetime}\" - a date range, inclusive\n"
-"  \"-{days}\" - within a given number of days of today\n"
+"Branch-based Access Control\n"
+"---------------------------"
 msgstr ""
 
 msgid ""
-"Mercurial's default format for showing changes between two versions of\n"
-"a file is compatible with the unified format of GNU diff, which can be\n"
-"used by GNU patch and many other standard tools."
+"Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n"
+"have branch-based access control. Keys in these sections can be\n"
+"either:"
 msgstr ""
 
 msgid ""
-"While this standard format is often enough, it does not encode the\n"
-"following information:"
+"- a branch name, or\n"
+"- an asterisk, to match any branch;"
 msgstr ""
 
-msgid ""
-"- executable status and other permission bits\n"
-"- copy or rename information\n"
-"- changes in binary files\n"
-"- creation or deletion of empty files"
+msgid "The corresponding values can be either:"
 msgstr ""
 
 msgid ""
-"Mercurial also supports the extended diff format from the git VCS\n"
-"which addresses these limitations. The git diff format is not produced\n"
-"by default because a few widespread tools still do not understand this\n"
-"format."
+"- a comma-separated list containing users and groups, or\n"
+"- an asterisk, to match anyone;"
 msgstr ""
 
 msgid ""
-"This means that when generating diffs from a Mercurial repository\n"
-"(e.g. with \"hg export\"), you should be careful about things like file\n"
-"copies and renames or other things mentioned above, because when\n"
-"applying a standard diff to a different repository, this extra\n"
-"information is lost. Mercurial's internal operations (like push and\n"
-"pull) are not affected by this, because they use an internal binary\n"
-"format for communicating changes."
+"Path-based Access Control\n"
+"-------------------------"
 msgstr ""
 
 msgid ""
-"To make Mercurial produce the git extended diff format, use the --git\n"
-"option available for many commands, or set 'git = True' in the [diff]\n"
-"section of your hgrc. You do not need to set this option when\n"
-"importing diffs in this format or using them in the mq extension.\n"
+"Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n"
+"access control. Keys in these sections accept a subtree pattern (with\n"
+"a glob syntax by default). The corresponding values follow the same\n"
+"syntax as the other sections above."
 msgstr ""
 
 msgid ""
-"HG\n"
-"    Path to the 'hg' executable, automatically passed when running\n"
-"    hooks, extensions or external tools. If unset or empty, this is\n"
-"    the hg executable's name if it's frozen, or an executable named\n"
-"    'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
-"    Windows) is searched."
+"Groups\n"
+"------"
 msgstr ""
 
 msgid ""
-"HGEDITOR\n"
-"    This is the name of the editor to run when committing. See EDITOR."
+"Group names must be prefixed with an ``@`` symbol. Specifying a group\n"
+"name has the same effect as specifying all the users in that group."
 msgstr ""
 
-msgid "    (deprecated, use .hgrc)"
+msgid ""
+"You can define group members in the ``acl.groups`` section.\n"
+"If a group name is not defined there, and Mercurial is running under\n"
+"a Unix-like system, the list of users will be taken from the OS.\n"
+"Otherwise, an exception will be raised."
 msgstr ""
 
 msgid ""
-"HGENCODING\n"
-"    This overrides the default locale setting detected by Mercurial.\n"
-"    This setting is used to convert data including usernames,\n"
-"    changeset descriptions, tag names, and branches. This setting can\n"
-"    be overridden with the --encoding command-line option."
+"Example Configuration\n"
+"---------------------"
 msgstr ""
 
-msgid ""
-"HGENCODINGMODE\n"
-"    This sets Mercurial's behavior for handling unknown characters\n"
-"    while transcoding user input. The default is \"strict\", which\n"
-"    causes Mercurial to abort if it can't map a character. Other\n"
-"    settings include \"replace\", which replaces unknown characters, and\n"
-"    \"ignore\", which drops them. This setting can be overridden with\n"
-"    the --encodingmode command-line option."
+msgid "::"
 msgstr ""
 
-msgid ""
-"HGMERGE\n"
-"    An executable to use for resolving merge conflicts. The program\n"
-"    will be executed with three arguments: local file, remote file,\n"
-"    ancestor file."
+msgid "  [hooks]"
 msgstr ""
 
 msgid ""
-"HGRCPATH\n"
-"    A list of files or directories to search for hgrc files. Item\n"
-"    separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
-"    platform default search path is used. If empty, only the .hg/hgrc\n"
-"    from the current repository is read."
+"  # Use this if you want to check access restrictions at commit time\n"
+"  pretxncommit.acl = python:hgext.acl.hook"
 msgstr ""
 
-msgid "    For each element in HGRCPATH:"
+msgid ""
+"  # Use this if you want to check access restrictions for pull, push,\n"
+"  # bundle and serve.\n"
+"  pretxnchangegroup.acl = python:hgext.acl.hook"
 msgstr ""
 
 msgid ""
-"    - if it's a directory, all files ending with .rc are added\n"
-"    - otherwise, the file itself will be added"
+"  [acl]\n"
+"  # Allow or deny access for incoming changes only if their source is\n"
+"  # listed here, let them pass otherwise. Source is \"serve\" for all\n"
+"  # remote access (http or ssh), \"push\", \"pull\" or \"bundle\" when the\n"
+"  # related commands are run locally.\n"
+"  # Default: serve\n"
+"  sources = serve"
 msgstr ""
 
-msgid ""
-"HGUSER\n"
-"    This is the string used as the author of a commit. If not set,\n"
-"    available values will be considered in this order:"
+msgid "  [acl.deny.branches]"
 msgstr ""
 
 msgid ""
-"    - HGUSER (deprecated)\n"
-"    - hgrc files from the HGRCPATH\n"
-"    - EMAIL\n"
-"    - interactive prompt\n"
-"    - LOGNAME (with '@hostname' appended)"
+"  # Everyone is denied to the frozen branch:\n"
+"  frozen-branch = *"
 msgstr ""
 
 msgid ""
-"EMAIL\n"
-"    May be used as the author of a commit; see HGUSER."
+"  # A bad user is denied on all branches:\n"
+"  * = bad-user"
 msgstr ""
 
-msgid ""
-"LOGNAME\n"
-"    May be used as the author of a commit; see HGUSER."
+msgid "  [acl.allow.branches]"
 msgstr ""
 
 msgid ""
-"VISUAL\n"
-"    This is the name of the editor to use when committing. See EDITOR."
+"  # A few users are allowed on branch-a:\n"
+"  branch-a = user-1, user-2, user-3"
 msgstr ""
 
 msgid ""
-"EDITOR\n"
-"    Sometimes Mercurial needs to open a text file in an editor for a\n"
-"    user to modify, for example when writing commit messages. The\n"
-"    editor it uses is determined by looking at the environment\n"
-"    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
-"    non-empty one is chosen. If all of them are empty, the editor\n"
-"    defaults to 'vi'."
+"  # Only one user is allowed on branch-b:\n"
+"  branch-b = user-1"
 msgstr ""
 
 msgid ""
-"PYTHONPATH\n"
-"    This is used by Python to find imported modules and may need to be\n"
-"    set appropriately if this Mercurial is not installed system-wide.\n"
+"  # The super user is allowed on any branch:\n"
+"  * = super-user"
 msgstr ""
 
 msgid ""
-"Mercurial has the ability to add new features through the use of\n"
-"extensions. Extensions may add new commands, add options to\n"
-"existing commands, change the default behavior of commands, or\n"
-"implement hooks."
+"  # Everyone is allowed on branch-for-tests:\n"
+"  branch-for-tests = *"
 msgstr ""
 
 msgid ""
-"Extensions are not loaded by default for a variety of reasons:\n"
-"they can increase startup overhead; they may be meant for advanced\n"
-"usage only; they may provide potentially dangerous abilities (such\n"
-"as letting you destroy or modify history); they might not be ready\n"
-"for prime time; or they may alter some usual behaviors of stock\n"
-"Mercurial. It is thus up to the user to activate extensions as\n"
-"needed."
+"  [acl.deny]\n"
+"  # This list is checked first. If a match is found, acl.allow is not\n"
+"  # checked. All users are granted access if acl.deny is not present.\n"
+"  # Format for both lists: glob pattern = user, ..., @group, ..."
 msgstr ""
 
 msgid ""
-"To enable the \"foo\" extension, either shipped with Mercurial or in\n"
-"the Python search path, create an entry for it in your hgrc, like\n"
-"this::"
+"  # To match everyone, use an asterisk for the user:\n"
+"  # my/glob/pattern = *"
 msgstr ""
 
 msgid ""
-"  [extensions]\n"
-"  foo ="
+"  # user6 will not have write access to any file:\n"
+"  ** = user6"
 msgstr ""
 
-msgid "You may also specify the full path to an extension::"
+msgid ""
+"  # Group \"hg-denied\" will not have write access to any file:\n"
+"  ** = @hg-denied"
 msgstr ""
 
 msgid ""
-"  [extensions]\n"
-"  myfeature = ~/.hgext/myfeature.py"
+"  # Nobody will be able to change \"DONT-TOUCH-THIS.txt\", despite\n"
+"  # everyone being able to change all other files. See below.\n"
+"  src/main/resources/DONT-TOUCH-THIS.txt = *"
 msgstr ""
 
 msgid ""
-"To explicitly disable an extension enabled in an hgrc of broader\n"
-"scope, prepend its path with !::"
+"  [acl.allow]\n"
+"  # if acl.allow is not present, all users are allowed by default\n"
+"  # empty acl.allow = no users allowed"
 msgstr ""
 
 msgid ""
-"  [extensions]\n"
-"  # disabling extension bar residing in /path/to/extension/bar.py\n"
-"  bar = !/path/to/extension/bar.py\n"
-"  # ditto, but no path was supplied for extension baz\n"
-"  baz = !\n"
+"  # User \"doc_writer\" has write access to any file under the \"docs\"\n"
+"  # folder:\n"
+"  docs/** = doc_writer"
 msgstr ""
 
 msgid ""
-"When Mercurial accepts more than one revision, they may be specified\n"
-"individually, or provided as a topologically continuous range,\n"
-"separated by the \":\" character."
+"  # User \"jack\" and group \"designers\" have write access to any file\n"
+"  # under the \"images\" folder:\n"
+"  images/** = jack, @designers"
 msgstr ""
 
 msgid ""
-"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
-"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
-"specified, it defaults to revision number 0. If END is not specified,\n"
-"it defaults to the tip. The range \":\" thus means \"all revisions\"."
+"  # Everyone (except for \"user6\" - see acl.deny above) will have write\n"
+"  # access to any file under the \"resources\" folder (except for 1\n"
+"  # file. See acl.deny):\n"
+"  src/main/resources/** = *"
 msgstr ""
 
-msgid "If BEGIN is greater than END, revisions are treated in reverse order."
+msgid "  .hgtags = release_engineer"
 msgstr ""
 
-msgid ""
-"A range acts as a closed interval. This means that a range of 3:5\n"
-"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
+#, python-format
+msgid "group '%s' is undefined"
 msgstr ""
 
+#, python-format
 msgid ""
-"Mercurial accepts several notations for identifying one or more files\n"
-"at a time."
+"config error - hook type \"%s\" cannot stop incoming changesets nor commits"
 msgstr ""
+"errore di configurazione - l'hook di tipo \"%s\" non può fermare né i "
+"changesetné i commit in entrata"
 
-msgid ""
-"By default, Mercurial treats filenames as shell-style extended glob\n"
-"patterns."
+#, python-format
+msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")"
 msgstr ""
+"acl: accesso negato per l'utente \"%s\" per il branch \"%s\" (changeset \"%s"
+"\")"
 
-msgid "Alternate pattern notations must be specified explicitly."
+#, python-format
+msgid "acl: user \"%s\" not allowed on branch \"%s\" (changeset \"%s\")"
 msgstr ""
+"acl: accesso non permesso per l'utente \"%s\" per il branch \"%s"
+"\" (changeset \"%s\")"
 
-msgid ""
-"To use a plain path name without any pattern matching, start it with\n"
-"``path:``. These path names must completely match starting at the\n"
-"current repository root."
-msgstr ""
+#, python-format
+msgid "acl: access denied for changeset %s"
+msgstr "acl: accesso negato per il changeset %s"
+
+msgid "track a line of development with movable markers"
+msgstr "segui una linea di sviluppo con puntatori mobili"
 
 msgid ""
-"To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
-"at the current directory; a glob such as ``*.c`` will only match files\n"
-"in the current directory ending with ``.c``."
+"Bookmarks are local movable markers to changesets. Every bookmark\n"
+"points to a changeset identified by its hash. If you commit a\n"
+"changeset that is based on a changeset that has a bookmark on it, the\n"
+"bookmark shifts to the new changeset."
 msgstr ""
+"I segnalibri di Mercurial sono puntatori locali e mobili a changeset. Ogni\n"
+"segnalibro punta ad un changeset identificato dal proprio hash. Se fai il "
+"commit di un\n"
+"changeset basato su un changeset che ha un segnalibro,\n"
+"il segnalibro è spostato sul nuovo changeset"
 
 msgid ""
-"The supported glob syntax extensions are ``**`` to match any string\n"
-"across path separators and ``{a,b}`` to mean \"a or b\"."
+"It is possible to use bookmark names in every revision lookup (e.g.\n"
+":hg:`merge`, :hg:`update`)."
 msgstr ""
+"E' possibile usare nomi di segnalibri in ogni ricerca di revisioni (es.\n"
+":hg:`merge`, :hg:`update`)."
 
 msgid ""
-"To use a Perl/Python regular expression, start a name with ``re:``.\n"
-"Regexp pattern matching is anchored at the root of the repository."
+"By default, when several bookmarks point to the same changeset, they\n"
+"will all move forward together. It is possible to obtain a more\n"
+"git-like experience by adding the following configuration option to\n"
+"your .hgrc::"
 msgstr ""
+"Di default, quando più segnalibri puntano allo stesso changeset, essi\n"
+"avanzeranno tutti assieme. È possibile avere un comportamento più simile\n"
+"a git aggiungendo la seguente opzione di configurazione al tuo .hgrc::"
 
-msgid "Plain examples::"
+msgid ""
+"  [bookmarks]\n"
+"  track.current = True"
 msgstr ""
 
 msgid ""
-"  path:foo/bar   a name bar in a directory named foo in the root\n"
-"                 of the repository\n"
-"  path:path:name a file or directory named \"path:name\""
+"This will cause Mercurial to track the bookmark that you are currently\n"
+"using, and only update it. This is similar to git's approach to\n"
+"branching.\n"
 msgstr ""
+"Questo porterà Mercurial a tener traccia del segnalibro su cui sei "
+"attualmente, e\n"
+"a limitarsi ad aggiornarlo. Questo è simile all'approccio di branching di "
+"git.\n"
 
-msgid "Glob examples::"
+msgid ""
+"    Bookmarks are pointers to certain commits that move when\n"
+"    committing. Bookmarks are local. They can be renamed, copied and\n"
+"    deleted. It is possible to use bookmark names in :hg:`merge` and\n"
+"    :hg:`update` to merge and update respectively to a given bookmark."
 msgstr ""
 
 msgid ""
-"  glob:*.c       any name ending in \".c\" in the current directory\n"
-"  *.c            any name ending in \".c\" in the current directory\n"
-"  **.c           any name ending in \".c\" in any subdirectory of the\n"
-"                 current directory including itself.\n"
-"  foo/*.c        any name ending in \".c\" in the directory foo\n"
-"  foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
-"                 including itself."
+"    You can use :hg:`bookmark NAME` to set a bookmark on the working\n"
+"    directory's parent revision with the given name. If you specify\n"
+"    a revision using -r REV (where REV may be an existing bookmark),\n"
+"    the bookmark is assigned to that revision.\n"
+"    "
 msgstr ""
 
-msgid "Regexp examples::"
-msgstr ""
+msgid "a bookmark of this name does not exist"
+msgstr "non esiste un segnalibro con questo nome"
 
-msgid "  re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
-msgstr ""
+msgid "a bookmark of the same name already exists"
+msgstr "esiste già un segnalibro con lo stesso nome"
 
-msgid "Mercurial supports several ways to specify individual revisions."
-msgstr ""
+msgid "new bookmark name required"
+msgstr "richiesto nuovo nome per il segnalibro"
 
-msgid ""
-"A plain integer is treated as a revision number. Negative integers are\n"
-"treated as sequential offsets from the tip, with -1 denoting the tip,\n"
-"-2 denoting the revision prior to the tip, and so forth."
-msgstr ""
+msgid "bookmark name required"
+msgstr "richiesto nome per il segnalibro"
 
-msgid ""
-"A 40-digit hexadecimal string is treated as a unique revision\n"
-"identifier."
-msgstr ""
+msgid "bookmark name cannot contain newlines"
+msgstr "il nome di un segnalibro non può contenere a capo"
 
-msgid ""
-"A hexadecimal string less than 40 characters long is treated as a\n"
-"unique revision identifier and is referred to as a short-form\n"
-"identifier. A short-form identifier is only valid if it is the prefix\n"
-"of exactly one full-length identifier."
-msgstr ""
+msgid "bookmark names cannot consist entirely of whitespace"
+msgstr "il nome di un segnalibro non può consistere interamente di whitespace"
 
-msgid ""
-"Any other string is treated as a tag or branch name. A tag name is a\n"
-"symbolic name associated with a revision identifier. A branch name\n"
-"denotes the tipmost revision of that branch. Tag and branch names must\n"
-"not contain the \":\" character."
-msgstr ""
+msgid "a bookmark cannot have the name of an existing branch"
+msgstr "un segnalibro non può avere lo stesso nome di una branch esistente"
 
-msgid ""
-"The reserved name \"tip\" is a special tag that always identifies the\n"
-"most recent revision."
+msgid "no bookmarks set\n"
 msgstr ""
 
-msgid ""
-"The reserved name \"null\" indicates the null revision. This is the\n"
-"revision of an empty repository, and the parent of revision 0."
+#, python-format
+msgid "updating bookmark %s\n"
+msgstr "sto aggiornando il segnalibro %s\n"
+
+#, python-format
+msgid "not updating divergent bookmark %s\n"
 msgstr ""
 
-msgid ""
-"The reserved name \".\" indicates the working directory parent. If no\n"
-"working directory is checked out, it is equivalent to null. If an\n"
-"uncommitted merge is in progress, \".\" is the revision of the first\n"
-"parent.\n"
-msgstr ""
+#, python-format
+msgid "updating bookmark %s failed!\n"
+msgstr "aggiornamento del segnalibro %s fallito!\n"
 
-msgid ""
-"Mercurial allows you to customize output of commands through\n"
-"templates. You can either pass in a template from the command\n"
-"line, via the --template option, or select an existing\n"
-"template-style (--style)."
-msgstr ""
+#, python-format
+msgid "remote bookmark %s not found!"
+msgstr "repository remoto %s non trovato!"
 
-msgid ""
-"You can customize output for any \"log-like\" command: log,\n"
-"outgoing, incoming, tip, parents, heads and glog."
-msgstr ""
+#, python-format
+msgid "importing bookmark %s\n"
+msgstr "importazione segnalibro %s\n"
 
-msgid ""
-"Three styles are packaged with Mercurial: default (the style used\n"
-"when no explicit preference is passed), compact and changelog.\n"
-"Usage::"
-msgstr ""
+#, python-format
+msgid "exporting bookmark %s\n"
+msgstr "esportazione segnalibro %s\n"
 
-msgid "    $ hg log -r1 --style changelog"
-msgstr ""
+#, python-format
+msgid "deleting remote bookmark %s\n"
+msgstr "eliminazione segnalibro remoto %s\n"
 
-msgid ""
-"A template is a piece of text, with markup to invoke variable\n"
-"expansion::"
+msgid "searching for changes\n"
+msgstr "sto cercando modifiche\n"
+
+msgid "no changes found\n"
+msgstr "nessuna modifica trovata\n"
+
+#, python-format
+msgid "comparing with %s\n"
+msgstr "sto confrontando con %s\n"
+
+msgid "bookmark to import"
+msgstr "segnalibro da importare"
+
+msgid "bookmark to export"
+msgstr "segnalibro da esportare"
+
+msgid "compare bookmark"
+msgstr "confronta segnalibro"
+
+msgid "force"
+msgstr "forza"
+
+msgid "REV"
 msgstr ""
 
-msgid ""
-"    $ hg log -r1 --template \"{node}\\n\"\n"
-"    b56ce7b07c52de7d5fd79fb89701ea538af65746"
+msgid "revision"
+msgstr "revisione"
+
+msgid "delete a given bookmark"
+msgstr "elimina un dato segnalibro"
+
+msgid "NAME"
+msgstr "NOME"
+
+msgid "rename a given bookmark"
+msgstr "rinomina un dato segnalibro"
+
+msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
+msgstr "hg bookmarks [-f] [-d] [-m NOME] [-r REV] [NOME]"
+
+msgid "hooks for integrating with the Bugzilla bug tracker"
 msgstr ""
 
 msgid ""
-"Strings in curly braces are called keywords. The availability of\n"
-"keywords depends on the exact context of the templater. These\n"
-"keywords are usually available for templating a log-like command:"
+"This hook extension adds comments on bugs in Bugzilla when changesets\n"
+"that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
+"bug status."
 msgstr ""
 
 msgid ""
-":author:    String. The unmodified author of the changeset.\n"
-":branches:  String. The name of the branch on which the changeset\n"
-"            was committed. Will be empty if the branch name was\n"
-"            default.\n"
-":date:      Date information. The date when the changeset was\n"
-"            committed.\n"
-":desc:      String. The text of the changeset description.\n"
-":diffstat:  String. Statistics of changes with the following\n"
-"            format: \"modified files: +added/-removed lines\"\n"
-":files:     List of strings. All files modified, added, or removed\n"
-"            by this changeset.\n"
-":file_adds: List of strings. Files added by this changeset.\n"
-":file_mods: List of strings. Files modified by this changeset.\n"
-":file_dels: List of strings. Files removed by this changeset.\n"
-":node:      String. The changeset identification hash, as a\n"
-"            40-character hexadecimal string.\n"
-":parents:   List of strings. The parents of the changeset.\n"
-":rev:       Integer. The repository-local changeset revision\n"
-"            number.\n"
-":tags:      List of strings. Any tags associated with the\n"
-"            changeset.\n"
-":latesttag: String. Most recent global tag in the ancestors of this\n"
-"            changeset.\n"
-":latesttagdistance: Integer. Longest path to the latest tag."
+"The hook updates the Bugzilla database directly. Only Bugzilla\n"
+"installations using MySQL are supported."
 msgstr ""
 
 msgid ""
-"The \"date\" keyword does not produce human-readable output. If you\n"
-"want to use a date in your output, you can use a filter to process\n"
-"it. Filters are functions which return a string based on the input\n"
-"variable. You can also use a chain of filters to get the desired\n"
-"output::"
+"The hook relies on a Bugzilla script to send bug change notification\n"
+"emails. That script changes between Bugzilla versions; the\n"
+"'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
+"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
+"be run by Mercurial as the user pushing the change; you will need to\n"
+"ensure the Bugzilla install file permissions are set appropriately."
 msgstr ""
 
 msgid ""
-"   $ hg tip --template \"{date|isodate}\\n\"\n"
-"   2008-08-21 18:22 +0000"
+"The extension is configured through three different configuration\n"
+"sections. These keys are recognized in the [bugzilla] section:"
 msgstr ""
 
-msgid "List of filters:"
+msgid ""
+"host\n"
+"  Hostname of the MySQL server holding the Bugzilla database."
 msgstr ""
 
 msgid ""
-":addbreaks:   Any text. Add an XHTML \"
\" tag before the end of\n"
-"              every line except the last.\n"
-":age:         Date. Returns a human-readable date/time difference\n"
-"              between the given date/time and the current\n"
-"              date/time.\n"
-":basename:    Any text. Treats the text as a path, and returns the\n"
-"              last component of the path after splitting by the\n"
-"              path separator (ignoring trailing separators). For\n"
-"              example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
-"              becomes \"bar\".\n"
-":stripdir:    Treat the text as path and strip a directory level,\n"
-"              if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
-"              \"foo\".\n"
-":date:        Date. Returns a date in a Unix date format, including\n"
-"              the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
-":domain:      Any text. Finds the first string that looks like an\n"
-"              email address, and extracts just the domain\n"
-"              component. Example: 'User ' becomes\n"
-"              'example.com'.\n"
-":email:       Any text. Extracts the first string that looks like\n"
-"              an email address. Example: 'User '\n"
-"              becomes 'user@example.com'.\n"
-":escape:      Any text. Replaces the special XML/XHTML characters\n"
-"              \"&\", \"<\" and \">\" with XML entities.\n"
-":fill68:      Any text. Wraps the text to fit in 68 columns.\n"
-":fill76:      Any text. Wraps the text to fit in 76 columns.\n"
-":firstline:   Any text. Returns the first line of text.\n"
-":nonempty:    Any text. Returns '(none)' if the string is empty.\n"
-":hgdate:      Date. Returns the date as a pair of numbers:\n"
-"              \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
-":isodate:     Date. Returns the date in ISO 8601 format:\n"
-"              \"2009-08-18 13:00 +0200\".\n"
-":isodatesec:  Date. Returns the date in ISO 8601 format, including\n"
-"              seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
-"              rfc3339date filter.\n"
-":localdate:   Date. Converts a date to local date.\n"
-":obfuscate:   Any text. Returns the input text rendered as a\n"
-"              sequence of XML entities.\n"
-":person:      Any text. Returns the text before an email address.\n"
-":rfc822date:  Date. Returns a date using the same format used in\n"
-"              email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
-":rfc3339date: Date. Returns a date using the Internet date format\n"
-"              specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
-":short:       Changeset hash. Returns the short form of a changeset\n"
-"              hash, i.e. a 12-byte hexadecimal string.\n"
-":shortdate:   Date. Returns a date like \"2006-09-18\".\n"
-":strip:       Any text. Strips all leading and trailing whitespace.\n"
-":tabindent:   Any text. Returns the text, with every line except\n"
-"              the first starting with a tab character.\n"
-":urlescape:   Any text. Escapes all \"special\" characters. For\n"
-"              example, \"foo bar\" becomes \"foo%20bar\".\n"
-":user:        Any text. Returns the user portion of an email\n"
-"              address.\n"
+"db\n"
+"  Name of the Bugzilla database in MySQL. Default 'bugs'."
 msgstr ""
 
-msgid "Valid URLs are of the form::"
+msgid ""
+"user\n"
+"  Username to use to access MySQL server. Default 'bugs'."
 msgstr ""
 
 msgid ""
-"  local/filesystem/path[#revision]\n"
-"  file://local/filesystem/path[#revision]\n"
-"  http://[user[:pass]@]host[:port]/[path][#revision]\n"
-"  https://[user[:pass]@]host[:port]/[path][#revision]\n"
-"  ssh://[user[:pass]@]host[:port]/[path][#revision]"
+"password\n"
+"  Password to use to access MySQL server."
 msgstr ""
 
 msgid ""
-"Paths in the local filesystem can either point to Mercurial\n"
-"repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
-"incoming --bundle')."
+"timeout\n"
+"  Database connection timeout (seconds). Default 5."
 msgstr ""
 
 msgid ""
-"An optional identifier after # indicates a particular branch, tag, or\n"
-"changeset to use from the remote repository. See also 'hg help\n"
-"revisions'."
+"version\n"
+"  Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
+"  '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
+"  to 2.18."
 msgstr ""
 
 msgid ""
-"Some features, such as pushing to http:// and https:// URLs are only\n"
-"possible if the feature is explicitly enabled on the remote Mercurial\n"
-"server."
+"bzuser\n"
+"  Fallback Bugzilla user name to record comments with, if changeset\n"
+"  committer cannot be found as a Bugzilla user."
 msgstr ""
 
-msgid "Some notes about using SSH with Mercurial:"
+msgid ""
+"bzdir\n"
+"   Bugzilla install directory. Used by default notify. Default\n"
+"   '/var/www/html/bugzilla'."
 msgstr ""
 
 msgid ""
-"- SSH requires an accessible shell account on the destination machine\n"
-"  and a copy of hg in the remote path or specified with as remotecmd.\n"
-"- path is relative to the remote user's home directory by default. Use\n"
-"  an extra slash at the start of a path to specify an absolute path::"
+"notify\n"
+"  The command to run to get Bugzilla to send bug change notification\n"
+"  emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
+"  and 'user' (committer bugzilla email). Default depends on version;\n"
+"  from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
+"  %(id)s %(user)s\"."
 msgstr ""
 
-msgid "    ssh://example.com//tmp/repository"
+msgid ""
+"regexp\n"
+"  Regular expression to match bug IDs in changeset commit message.\n"
+"  Must contain one \"()\" group. The default expression matches 'Bug\n"
+"  1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
+"  1234 and 5678' and variations thereof. Matching is case insensitive."
 msgstr ""
 
 msgid ""
-"- Mercurial doesn't use its own compression via SSH; the right thing\n"
-"  to do is to configure it in your ~/.ssh/config, e.g.::"
+"style\n"
+"  The style file to use when formatting comments."
 msgstr ""
 
 msgid ""
-"    Host *.mylocalnetwork.example.com\n"
-"      Compression no\n"
-"    Host *\n"
-"      Compression yes"
+"template\n"
+"  Template to use when formatting comments. Overrides style if\n"
+"  specified. In addition to the usual Mercurial keywords, the\n"
+"  extension specifies::"
 msgstr ""
 
 msgid ""
-"  Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
-"  with the --ssh command line option."
+"    {bug}       The Bugzilla bug ID.\n"
+"    {root}      The full pathname of the Mercurial repository.\n"
+"    {webroot}   Stripped pathname of the Mercurial repository.\n"
+"    {hgweb}     Base URL for browsing Mercurial repositories."
 msgstr ""
 
 msgid ""
-"These URLs can all be stored in your hgrc with path aliases under the\n"
-"[paths] section like so::"
+"  Default 'changeset {node|short} in repo {root} refers '\n"
+"          'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'"
 msgstr ""
 
 msgid ""
-"  [paths]\n"
-"  alias1 = URL1\n"
-"  alias2 = URL2\n"
-"  ..."
+"strip\n"
+"  The number of slashes to strip from the front of {root} to produce\n"
+"  {webroot}. Default 0."
 msgstr ""
 
 msgid ""
-"You can then use the alias for any command that uses a URL (for\n"
-"example 'hg pull alias1' would pull from the 'alias1' path)."
+"usermap\n"
+"  Path of file containing Mercurial committer ID to Bugzilla user ID\n"
+"  mappings. If specified, the file should contain one mapping per\n"
+"  line, \"committer\"=\"Bugzilla user\". See also the [usermap] section."
 msgstr ""
 
 msgid ""
-"Two path aliases are special because they are used as defaults when\n"
-"you do not provide the URL to a command:"
+"The [usermap] section is used to specify mappings of Mercurial\n"
+"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
+"\"committer\"=\"Bugzilla user\""
 msgstr ""
 
-msgid ""
-"default:\n"
-"  When you create a repository with hg clone, the clone command saves\n"
-"  the location of the source repository as the new repository's\n"
-"  'default' path. This is then used when you omit path from push- and\n"
-"  pull-like commands (including incoming and outgoing)."
+msgid "Finally, the [web] section supports one entry:"
 msgstr ""
 
 msgid ""
-"default-push:\n"
-"  The push command will look for a path named 'default-push', and\n"
-"  prefer it over 'default' if both are defined.\n"
+"baseurl\n"
+"  Base URL for browsing Mercurial repositories. Reference from\n"
+"  templates as {hgweb}."
 msgstr ""
 
-msgid "hooks for controlling repository access"
+msgid "Activating the extension::"
 msgstr ""
 
 msgid ""
-"This hook makes it possible to allow or deny write access to portions\n"
-"of a repository when receiving incoming changesets."
+"    [extensions]\n"
+"    bugzilla ="
 msgstr ""
 
 msgid ""
-"The authorization is matched based on the local user name on the\n"
-"system where the hook runs, and not the committer of the original\n"
-"changeset (since the latter is merely informative)."
+"    [hooks]\n"
+"    # run bugzilla hook on every change pulled or pushed in here\n"
+"    incoming.bugzilla = python:hgext.bugzilla.hook"
 msgstr ""
 
-msgid ""
-"The acl hook is best used along with a restricted shell like hgsh,\n"
-"preventing authenticating users from doing anything other than\n"
-"pushing or pulling. The hook is not safe to use if users have\n"
-"interactive shell access, as they can then disable the hook.\n"
-"Nor is it safe if remote users share an account, because then there\n"
-"is no way to distinguish them."
+msgid "Example configuration:"
 msgstr ""
 
-msgid "To use this hook, configure the acl extension in your hgrc like this::"
+msgid ""
+"This example configuration is for a collection of Mercurial\n"
+"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
+"installation in /opt/bugzilla-3.2. ::"
 msgstr ""
 
 msgid ""
-"  [extensions]\n"
-"  acl ="
+"    [bugzilla]\n"
+"    host=localhost\n"
+"    password=XYZZY\n"
+"    version=3.0\n"
+"    bzuser=unknown@domain.com\n"
+"    bzdir=/opt/bugzilla-3.2\n"
+"    template=Changeset {node|short} in {root|basename}.\n"
+"             {hgweb}/{webroot}/rev/{node|short}\\n\n"
+"             {desc}\\n\n"
+"    strip=5"
 msgstr ""
 
 msgid ""
-"  [hooks]\n"
-"  pretxnchangegroup.acl = python:hgext.acl.hook"
+"    [web]\n"
+"    baseurl=http://dev.domain.com/hg"
 msgstr ""
 
 msgid ""
-"  [acl]\n"
-"  # Check whether the source of incoming changes is in this list\n"
-"  # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
-"  sources = serve"
+"    [usermap]\n"
+"    user@emaildomain.com=user.name@bugzilladomain.com"
 msgstr ""
 
-msgid ""
-"The allow and deny sections take a subtree pattern as key (with a glob\n"
-"syntax by default), and a comma separated list of users as the\n"
-"corresponding value. The deny list is checked before the allow list\n"
-"is. ::"
+msgid "Commits add a comment to the Bugzilla bug record of the form::"
 msgstr ""
 
 msgid ""
-"  [acl.allow]\n"
-"  # If acl.allow is not present, all users are allowed by default.\n"
-"  # An empty acl.allow section means no users allowed.\n"
-"  docs/** = doc_writer\n"
-"  .hgtags = release_engineer"
+"    Changeset 3b16791d6642 in repository-name.\n"
+"    http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
 msgstr ""
 
-msgid ""
-"  [acl.deny]\n"
-"  # If acl.deny is not present, no users are refused by default.\n"
-"  # An empty acl.deny section means all users allowed.\n"
-"  glob pattern = user4, user5\n"
-"   ** = user6\n"
+msgid "    Changeset commit comment. Bug 1234.\n"
 msgstr ""
 
 #, python-format
-msgid "config error - hook type \"%s\" cannot stop incoming changesets"
-msgstr "errore di configurazione - l'hook di tipo \"%s\" non pu fermare i changeset in entrata"
+msgid "connecting to %s:%s as %s, password %s\n"
+msgstr "sto connettendomi a %s:%s come %s, password %s\n"
 
 #, python-format
-msgid "acl: access denied for changeset %s"
-msgstr "acl: accesso negato per il changeset %s"
+msgid "query: %s %s\n"
+msgstr "query: %s %s\n"
 
-#, fuzzy
-msgid "track a line of development with movable markers"
-msgstr "mercurial bookmarks"
+#, python-format
+msgid "failed query: %s %s\n"
+msgstr "query fallita: %s %s\n"
 
-#, fuzzy
-msgid ""
-"Bookmarks are local movable markers to changesets. Every bookmark\n"
-"points to a changeset identified by its hash. If you commit a\n"
-"changeset that is based on a changeset that has a bookmark on it, the\n"
-"bookmark shifts to the new changeset."
-msgstr ""
-"I segnalibri di Mercurial sono puntatori locali e mobili a changeset. Ogni\n"
-"segnalibro punta ad un changeset identificato dal proprio hash. Se fai il commit di un\n"
-"changeset basato su un changeset che ha un segnalibro, \n"
-"il segnalibro  spostato sul nuovo changeset"
+msgid "unknown database schema"
+msgstr "schema del database sconosciuto"
 
-#, fuzzy
-msgid ""
-"It is possible to use bookmark names in every revision lookup (e.g. hg\n"
-"merge, hg update)."
-msgstr ""
-"E' possibile usare nomi di segnalibri in ogni ricerca di revisioni (es. hg\n"
-"merge, hg update)."
-
-#, fuzzy
-msgid ""
-"By default, when several bookmarks point to the same changeset, they\n"
-"will all move forward together. It is possible to obtain a more\n"
-"git-like experience by adding the following configuration option to\n"
-"your .hgrc::"
-msgstr ""
-"L'estensione bookmark offre la possibilit di avere un'esperienza pi simile a git\n"
-"aggiungendo la seguente opzione di configurazione al tuo .hgrc:"
-
-#, fuzzy
-msgid ""
-"  [bookmarks]\n"
-"  track.current = True"
-msgstr ""
-"[bookmarks]\n"
-"track.current = True"
+#, python-format
+msgid "bug %d already knows about changeset %s\n"
+msgstr "il bug %d è già a conoscenza del changeset %s\n"
 
-#, fuzzy
-msgid ""
-"This will cause Mercurial to track the bookmark that you are currently\n"
-"using, and only update it. This is similar to git's approach to\n"
-"branching.\n"
-msgstr ""
-"Questo porter i segnalibri a tener traccia del segnalibro su cui sei attualmente,e\n"
-"ad aggiornarlo. Questo  simile all'approccio di branching di git.\n"
+msgid "telling bugzilla to send mail:\n"
+msgstr "sto dicendo a bugzilla di inviare la mail:\n"
 
-msgid ""
-"    Bookmarks are pointers to certain commits that move when\n"
-"    committing. Bookmarks are local. They can be renamed, copied and\n"
-"    deleted. It is possible to use bookmark names in 'hg merge' and\n"
-"    'hg update' to merge and update respectively to a given bookmark."
-msgstr ""
+#, python-format
+msgid "  bug %s\n"
+msgstr "  bug %s\n"
 
-msgid ""
-"    You can use 'hg bookmark NAME' to set a bookmark on the working\n"
-"    directory's parent revision with the given name. If you specify\n"
-"    a revision using -r REV (where REV may be an existing bookmark),\n"
-"    the bookmark is assigned to that revision.\n"
-"    "
-msgstr ""
+#, python-format
+msgid "running notify command %s\n"
+msgstr "sto eseguendo il comando di notifica %s\n"
 
-msgid "a bookmark of this name does not exist"
-msgstr "non esiste un segnalibro con questo nome"
+#, python-format
+msgid "bugzilla notify command %s"
+msgstr "comando di notifica di bugzilla %s"
 
-msgid "a bookmark of the same name already exists"
-msgstr "esiste già un segnalibro con lo stesso nome"
+msgid "done\n"
+msgstr "fatto\n"
 
-msgid "new bookmark name required"
-msgstr "richiesto nuovo nome per il segnalibro"
+#, python-format
+msgid "looking up user %s\n"
+msgstr "ricercando l'utente %s\n"
 
-msgid "bookmark name required"
-msgstr "richiesto nome per il segnalibro"
+#, python-format
+msgid "cannot find bugzilla user id for %s"
+msgstr "impossibile trovare nome utente bugzilla per %s"
 
-msgid "bookmark name cannot contain newlines"
-msgstr "il nome di un segnalibro non può contenere a capo"
+#, python-format
+msgid "cannot find bugzilla user id for %s or %s"
+msgstr "impossibile trovare nome utente bugzilla per %s o %s"
 
-msgid "a bookmark cannot have the name of an existing branch"
-msgstr "un segnalibro non può avere lo stesso nome di una branch esistente"
+#, python-format
+msgid "bugzilla version %s not supported"
+msgstr "versione di bugzilla %s non supportata"
 
-msgid "force"
-msgstr "forza"
+msgid ""
+"changeset {node|short} in repo {root} refers to bug {bug}.\n"
+"details:\n"
+"\t{desc|tabindent}"
+msgstr ""
+"changeset {node|short} nel repository {root} si riferisce al bug {bug}.\n"
+"dettagli:\n"
+"\t{desc|tabindent}"
 
-msgid "revision"
-msgstr "revisione"
+#, python-format
+msgid "python mysql support not available: %s"
+msgstr "il supporto per python per mysql non è disponibile: %s"
 
-msgid "delete a given bookmark"
-msgstr "elimina un dato segnalibro"
+#, python-format
+msgid "hook type %s does not pass a changeset id"
+msgstr ""
 
-msgid "rename a given bookmark"
-msgstr "rinomina un dato segnalibro"
+#, python-format
+msgid "database error: %s"
+msgstr "errore del database: %s"
 
-msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
-msgstr "hg bookmarks [-f] [-d] [-m NOME] [-r REV] [NOME]"
+msgid "command to display child changesets"
+msgstr "comando per mostrare i changeset figli"
 
-msgid "hooks for integrating with the Bugzilla bug tracker"
+msgid "show the children of the given or working directory revision"
 msgstr ""
+"mostra i figli della revisione data o di quella della directory di lavoro"
 
 msgid ""
-"This hook extension adds comments on bugs in Bugzilla when changesets\n"
-"that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
-"bug status."
+"    Print the children of the working directory's revisions. If a\n"
+"    revision is given via -r/--rev, the children of that revision will\n"
+"    be printed. If a file argument is given, revision in which the\n"
+"    file was last changed (after the working directory revision or the\n"
+"    argument to --rev if given) is printed.\n"
+"    "
 msgstr ""
+"    Stampa le revisioni figlie della directory di lavoro. Se una\n"
+"    revisione è data tramite --rev, verranno stampati i figli di\n"
+"    quella revisione. Se viene fornito un file come argomento,\n"
+"    verrà stampata l'ultima revisione in cui il file è stato\n"
+"    modificato (dopo la revisione della directory di lavoro\n"
+"    o dell'argomento di --rev se fornito).\n"
+"    "
 
-msgid ""
-"The hook updates the Bugzilla database directly. Only Bugzilla\n"
-"installations using MySQL are supported."
-msgstr ""
+msgid "show children of the specified revision"
+msgstr "mostra i figli della revisione specificata"
 
-msgid ""
-"The hook relies on a Bugzilla script to send bug change notification\n"
-"emails. That script changes between Bugzilla versions; the\n"
-"'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
-"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
-"be run by Mercurial as the user pushing the change; you will need to\n"
-"ensure the Bugzilla install file permissions are set appropriately."
-msgstr ""
+msgid "hg children [-r REV] [FILE]"
+msgstr "hg·children·[-r·REV]·[FILE]"
 
-msgid ""
-"The extension is configured through three different configuration\n"
-"sections. These keys are recognized in the [bugzilla] section:"
+msgid "command to display statistics about repository history"
+msgstr "comando per mostrare statistiche sulla storia del repository"
+
+#, python-format
+msgid "Revision %d is a merge, ignoring...\n"
+msgstr "La revisione %d è un merge, ignoro...\n"
+
+msgid "analyzing"
 msgstr ""
 
+msgid "histogram of changes to the repository"
+msgstr "istogramma delle modifiche al repository"
+
 msgid ""
-"host\n"
-"  Hostname of the MySQL server holding the Bugzilla database."
+"    This command will display a histogram representing the number\n"
+"    of changed lines or revisions, grouped according to the given\n"
+"    template. The default template will group changes by author.\n"
+"    The --dateformat option may be used to group the results by\n"
+"    date instead."
 msgstr ""
 
 msgid ""
-"db\n"
-"  Name of the Bugzilla database in MySQL. Default 'bugs'."
+"    Statistics are based on the number of changed lines, or\n"
+"    alternatively the number of matching revisions if the\n"
+"    --changesets option is specified."
 msgstr ""
 
-msgid ""
-"user\n"
-"  Username to use to access MySQL server. Default 'bugs'."
+msgid "    Examples::"
 msgstr ""
 
 msgid ""
-"password\n"
-"  Password to use to access MySQL server."
+"      # display count of changed lines for every committer\n"
+"      hg churn -t '{author|email}'"
 msgstr ""
 
 msgid ""
-"timeout\n"
-"  Database connection timeout (seconds). Default 5."
+"      # display daily activity graph\n"
+"      hg churn -f '%H' -s -c"
 msgstr ""
 
 msgid ""
-"version\n"
-"  Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
-"  '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
-"  to 2.18."
+"      # display activity of developers by month\n"
+"      hg churn -f '%Y-%m' -s -c"
 msgstr ""
 
 msgid ""
-"bzuser\n"
-"  Fallback Bugzilla user name to record comments with, if changeset\n"
-"  committer cannot be found as a Bugzilla user."
+"      # display count of lines changed in every year\n"
+"      hg churn -f '%Y' -s"
 msgstr ""
 
 msgid ""
-"bzdir\n"
-"   Bugzilla install directory. Used by default notify. Default\n"
-"   '/var/www/html/bugzilla'."
+"    It is possible to map alternate email addresses to a main address\n"
+"    by providing a file using the following format::"
 msgstr ""
 
-msgid ""
-"notify\n"
-"  The command to run to get Bugzilla to send bug change notification\n"
-"  emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
-"  and 'user' (committer bugzilla email). Default depends on version;\n"
-"  from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
-"  %(id)s %(user)s\"."
+msgid "       = "
 msgstr ""
 
 msgid ""
-"regexp\n"
-"  Regular expression to match bug IDs in changeset commit message.\n"
-"  Must contain one \"()\" group. The default expression matches 'Bug\n"
-"  1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
-"  1234 and 5678' and variations thereof. Matching is case insensitive."
+"    Such a file may be specified with the --aliases option, otherwise\n"
+"    a .hgchurn file will be looked for in the working directory root.\n"
+"    "
 msgstr ""
 
-msgid ""
-"style\n"
-"  The style file to use when formatting comments."
+msgid "count rate for the specified revision or range"
+msgstr "misura velocità per le revisioni o il range specificati"
+
+msgid "DATE"
 msgstr ""
 
-msgid ""
-"template\n"
-"  Template to use when formatting comments. Overrides style if\n"
-"  specified. In addition to the usual Mercurial keywords, the\n"
-"  extension specifies::"
+msgid "count rate for revisions matching date spec"
+msgstr "misura velocità per le revisioni che corrispondono ad una data fornita"
+
+msgid "TEMPLATE"
 msgstr ""
 
-msgid ""
-"    {bug}       The Bugzilla bug ID.\n"
-"    {root}      The full pathname of the Mercurial repository.\n"
-"    {webroot}   Stripped pathname of the Mercurial repository.\n"
-"    {hgweb}     Base URL for browsing Mercurial repositories."
+msgid "template to group changesets"
 msgstr ""
 
-msgid ""
-"  Default 'changeset {node|short} in repo {root} refers '\n"
-"          'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'"
+msgid "FORMAT"
 msgstr ""
 
-msgid ""
-"strip\n"
-"  The number of slashes to strip from the front of {root} to produce\n"
-"  {webroot}. Default 0."
+msgid "strftime-compatible format for grouping by date"
 msgstr ""
 
-msgid ""
-"usermap\n"
-"  Path of file containing Mercurial committer ID to Bugzilla user ID\n"
-"  mappings. If specified, the file should contain one mapping per\n"
-"  line, \"committer\"=\"Bugzilla user\". See also the [usermap] section."
+msgid "count rate by number of changesets"
+msgstr "misura velocità dal numero di changeset"
+
+msgid "sort by key (default: sort by count)"
+msgstr "ordina per chiave (default: ordina per conteggio)"
+
+msgid "display added/removed lines separately"
 msgstr ""
 
-msgid ""
-"The [usermap] section is used to specify mappings of Mercurial\n"
-"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
-"\"committer\"=\"Bugzilla user\""
+msgid "FILE"
+msgstr "FILE"
+
+msgid "file with email aliases"
+msgstr "file con alias email"
+
+msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]"
+msgstr "hg churn [-d DATA] [-r REV] [--aliases FILE] [FILE]"
+
+msgid "colorize output from some commands"
 msgstr ""
 
-msgid "Finally, the [web] section supports one entry:"
+msgid ""
+"This extension modifies the status and resolve commands to add color to "
+"their\n"
+"output to reflect file status, the qseries command to add color to reflect\n"
+"patch status (applied, unapplied, missing), and to diff-related\n"
+"commands to highlight additions, removals, diff headers, and trailing\n"
+"whitespace."
 msgstr ""
 
 msgid ""
-"baseurl\n"
-"  Base URL for browsing Mercurial repositories. Reference from\n"
-"  templates as {hgweb}."
+"Other effects in addition to color, like bold and underlined text, are\n"
+"also available. Effects are rendered with the ECMA-48 SGR control\n"
+"function (aka ANSI escape codes). This module also provides the\n"
+"render_text function, which can be used to add effects to any text."
 msgstr ""
 
-msgid "Activating the extension::"
+msgid "Default effects may be overridden from the .hgrc file::"
 msgstr ""
 
 msgid ""
-"    [extensions]\n"
-"    bugzilla ="
+"  [color]\n"
+"  status.modified = blue bold underline red_background\n"
+"  status.added = green bold\n"
+"  status.removed = red bold blue_background\n"
+"  status.deleted = cyan bold underline\n"
+"  status.unknown = magenta bold underline\n"
+"  status.ignored = black bold"
 msgstr ""
 
 msgid ""
-"    [hooks]\n"
-"    # run bugzilla hook on every change pulled or pushed in here\n"
-"    incoming.bugzilla = python:hgext.bugzilla.hook"
-msgstr ""
-
-msgid "Example configuration:"
+"  # 'none' turns off all effects\n"
+"  status.clean = none\n"
+"  status.copied = none"
 msgstr ""
 
 msgid ""
-"This example configuration is for a collection of Mercurial\n"
-"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
-"installation in /opt/bugzilla-3.2. ::"
+"  qseries.applied = blue bold underline\n"
+"  qseries.unapplied = black bold\n"
+"  qseries.missing = red bold"
 msgstr ""
 
 msgid ""
-"    [bugzilla]\n"
-"    host=localhost\n"
-"    password=XYZZY\n"
-"    version=3.0\n"
-"    bzuser=unknown@domain.com\n"
-"    bzdir=/opt/bugzilla-3.2\n"
-"    template=Changeset {node|short} in {root|basename}.\n"
-"             {hgweb}/{webroot}/rev/{node|short}\\n\n"
-"             {desc}\\n\n"
-"    strip=5"
+"  diff.diffline = bold\n"
+"  diff.extended = cyan bold\n"
+"  diff.file_a = red bold\n"
+"  diff.file_b = green bold\n"
+"  diff.hunk = magenta\n"
+"  diff.deleted = red\n"
+"  diff.inserted = green\n"
+"  diff.changed = white\n"
+"  diff.trailingwhitespace = bold red_background"
 msgstr ""
 
 msgid ""
-"    [web]\n"
-"    baseurl=http://dev.domain.com/hg"
+"  resolve.unresolved = red bold\n"
+"  resolve.resolved = green bold"
 msgstr ""
 
-msgid ""
-"    [usermap]\n"
-"    user@emaildomain.com=user.name@bugzilladomain.com"
+msgid "  bookmarks.current = green"
 msgstr ""
 
-msgid "Commits add a comment to the Bugzilla bug record of the form::"
+msgid ""
+"The color extension will try to detect whether to use ANSI codes or\n"
+"Win32 console APIs, unless it is made explicit::"
 msgstr ""
 
 msgid ""
-"    Changeset 3b16791d6642 in repository-name.\n"
-"    http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
+"  [color]\n"
+"  mode = ansi"
 msgstr ""
 
-msgid "    Changeset commit comment. Bug 1234.\n"
+msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color."
 msgstr ""
 
 #, python-format
-msgid "connecting to %s:%s as %s, password %s\n"
-msgstr "sto connettendomi a %s:%s come %s, password %s\n"
-
-#, python-format
-msgid "query: %s %s\n"
-msgstr "query: %s %s\n"
-
-#, python-format
-msgid "failed query: %s %s\n"
-msgstr "query fallita: %s %s\n"
-
-msgid "unknown database schema"
-msgstr "schema del database sconosciuto"
-
-#, python-format
-msgid "bug %d already knows about changeset %s\n"
-msgstr "il bug %d  gi a conoscenza del changeset %s\n"
-
-msgid "telling bugzilla to send mail:\n"
-msgstr "sto dicendo a bugzilla di inviare la mail:\n"
-
-#, python-format
-msgid "  bug %s\n"
-msgstr "  bug %s\n"
-
-#, python-format
-msgid "running notify command %s\n"
-msgstr "sto eseguendo il comando di notifica %s\n"
-
-#, python-format
-msgid "bugzilla notify command %s"
-msgstr "comando di notifica di bugzilla %s"
-
-msgid "done\n"
-msgstr "fatto\n"
-
-#, python-format
-msgid "looking up user %s\n"
-msgstr "ricercando l'utente %s\n"
-
-#, python-format
-msgid "cannot find bugzilla user id for %s"
-msgstr "impossibile trovare nome utente bugzilla per %s"
-
-#, python-format
-msgid "cannot find bugzilla user id for %s or %s"
-msgstr "impossibile trovare nome utente bugzilla per %s o %s"
-
-#, python-format
-msgid "bugzilla version %s not supported"
-msgstr "versione di bugzilla %s non supportata"
+msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
+msgstr ""
 
-msgid ""
-"changeset {node|short} in repo {root} refers to bug {bug}.\n"
-"details:\n"
-"\t{desc|tabindent}"
+msgid "win32console not found, please install pywin32\n"
 msgstr ""
-"changeset {node|short} nel repository {root} si riferisce al bug {bug}.\n"
-"dettagli:\n"
-"\t{desc|tabindent}"
 
-#, python-format
-msgid "python mysql support not available: %s"
-msgstr "il supporto per python per mysql non è disponibile: %s"
+msgid "when to colorize (always, auto, or never)"
+msgstr "quando colorare (sempre, auto o mai)"
 
-#, python-format
-msgid "hook type %s does not pass a changeset id"
+msgid "TYPE"
 msgstr ""
 
-#, python-format
-msgid "database error: %s"
-msgstr "errore del database: %s"
+msgid "import revisions from foreign VCS repositories into Mercurial"
+msgstr "importa revisioni da repository di altri VCS in Mercurial"
 
-#, fuzzy
-msgid "command to display child changesets"
-msgstr "usa il comando per controllare lo stato del changeset"
+msgid "convert a foreign SCM repository to a Mercurial one."
+msgstr ""
 
-#, fuzzy
-msgid "show the children of the given or working directory revision"
-msgstr "mostra i genitori della directory di lavoro o di una revisione"
+msgid "    Accepted source formats [identifiers]:"
+msgstr ""
 
-#, fuzzy
 msgid ""
-"    Print the children of the working directory's revisions. If a\n"
-"    revision is given via -r/--rev, the children of that revision will\n"
-"    be printed. If a file argument is given, revision in which the\n"
-"    file was last changed (after the working directory revision or the\n"
-"    argument to --rev if given) is printed.\n"
-"    "
+"    - Mercurial [hg]\n"
+"    - CVS [cvs]\n"
+"    - Darcs [darcs]\n"
+"    - git [git]\n"
+"    - Subversion [svn]\n"
+"    - Monotone [mtn]\n"
+"    - GNU Arch [gnuarch]\n"
+"    - Bazaar [bzr]\n"
+"    - Perforce [p4]"
 msgstr ""
-"    Stampa le revisioni genitori della directory di lavoro. Se una\n"
-"    revisione è data tramite --rev, verrà stampato il genitore di\n"
-"    quella revisione. Se viene fornito un file come argomento,\n"
-"    verrà stampata l'ultima revisione in cui il file è stato\n"
-"    modificato (prima della revisione della directory di lavoro\n"
-"    o dell'argomento di --rev se fornito).\n"
-"    "
-
-#, fuzzy
-msgid "show children of the specified revision"
-msgstr "mostra i figli della revisione specificata"
 
-msgid "hg children [-r REV] [FILE]"
-msgstr "hg·children·[-r·REV]·[FILE]"
-
-#, fuzzy
-msgid "command to display statistics about repository history"
-msgstr "comando per mostrare alcune statistiche sulla storia delle revisioni"
-
-#, python-format
-msgid "Revision %d is a merge, ignoring...\n"
-msgstr "La revisione %d è un merge, ignoro...\n"
-
-#, fuzzy, python-format
-msgid "generating stats: %d%%"
-msgstr "sto generando le statistiche: %d%%"
-
-msgid "histogram of changes to the repository"
+msgid "    Accepted destination formats [identifiers]:"
 msgstr ""
 
 msgid ""
-"    This command will display a histogram representing the number\n"
-"    of changed lines or revisions, grouped according to the given\n"
-"    template. The default template will group changes by author.\n"
-"    The --dateformat option may be used to group the results by\n"
-"    date instead."
+"    - Mercurial [hg]\n"
+"    - Subversion [svn] (history on branches is not preserved)"
 msgstr ""
 
 msgid ""
-"    Statistics are based on the number of changed lines, or\n"
-"    alternatively the number of matching revisions if the\n"
-"    --changesets option is specified."
+"    If no revision is given, all revisions will be converted.\n"
+"    Otherwise, convert will only import up to the named revision\n"
+"    (given in a format understood by the source)."
 msgstr ""
 
-msgid "    Examples::"
+msgid ""
+"    If no destination directory name is specified, it defaults to the\n"
+"    basename of the source with '-hg' appended. If the destination\n"
+"    repository doesn't exist, it will be created."
 msgstr ""
 
 msgid ""
-"      # display count of changed lines for every committer\n"
-"      hg churn -t '{author|email}'"
+"    By default, all sources except Mercurial will use --branchsort.\n"
+"    Mercurial uses --sourcesort to preserve original revision numbers\n"
+"    order. Sort modes have the following effects:"
 msgstr ""
 
 msgid ""
-"      # display daily activity graph\n"
-"      hg churn -f '%H' -s -c"
+"    --branchsort  convert from parent to child revision when possible,\n"
+"                  which means branches are usually converted one after\n"
+"                  the other. It generates more compact repositories."
 msgstr ""
 
 msgid ""
-"      # display activity of developers by month\n"
-"      hg churn -f '%Y-%m' -s -c"
+"    --datesort    sort revisions by date. Converted repositories have\n"
+"                  good-looking changelogs but are often an order of\n"
+"                  magnitude larger than the same ones generated by\n"
+"                  --branchsort."
 msgstr ""
 
 msgid ""
-"      # display count of lines changed in every year\n"
-"      hg churn -f '%Y' -s"
+"    --sourcesort  try to preserve source revisions order, only\n"
+"                  supported by Mercurial sources."
 msgstr ""
 
 msgid ""
-"    It is possible to map alternate email addresses to a main address\n"
-"    by providing a file using the following format::"
+"    If  isn't given, it will be put in a default location\n"
+"    (/.hg/shamap by default). The  is a simple text file\n"
+"    that maps each source commit ID to the destination ID for that\n"
+"    revision, like so::"
 msgstr ""
 
-msgid "       "
+msgid "       "
 msgstr ""
 
 msgid ""
-"    Such a file may be specified with the --aliases option, otherwise\n"
-"    a .hgchurn file will be looked for in the working directory root.\n"
-"    "
+"    If the file doesn't exist, it's automatically created. It's\n"
+"    updated on each commit copied, so convert-repo can be interrupted\n"
+"    and can be run repeatedly to copy new commits."
 msgstr ""
 
-msgid "count rate for the specified revision or range"
+msgid ""
+"    The [username mapping] file is a simple text file that maps each\n"
+"    source commit author to a destination commit author. It is handy\n"
+"    for source SCMs that use unix logins to identify authors (eg:\n"
+"    CVS). One line per author mapping and the line format is:\n"
+"    srcauthor=whatever string you want"
 msgstr ""
 
-#, fuzzy
-msgid "count rate for revisions matching date spec"
-msgstr "mostra le revisioni che corrispondono ad una data fornita"
-
-msgid "template to group changesets"
+msgid ""
+"    The filemap is a file that allows filtering and remapping of files\n"
+"    and directories. Each line can contain one of the following\n"
+"    directives::"
 msgstr ""
 
-msgid "strftime-compatible format for grouping by date"
+msgid "      include path/to/file-or-dir"
 msgstr ""
 
-msgid "count rate by number of changesets"
+msgid "      exclude path/to/file-or-dir"
 msgstr ""
 
-msgid "sort by key (default: sort by count)"
-msgstr "ordina per chiave (default: ordina per conteggio)"
-
-msgid "file with email aliases"
-msgstr "file con alias email"
-
-msgid "show progress"
-msgstr "mostra progresso"
-
-msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
-msgstr "hg churn [-d DATA] [-r REV] [--aliases FILE] [--progress] [FILE]"
-
-msgid "colorize output from some commands"
+msgid "      rename path/to/source path/to/destination"
 msgstr ""
 
 msgid ""
-"This extension modifies the status command to add color to its output\n"
-"to reflect file status, the qseries command to add color to reflect\n"
-"patch status (applied, unapplied, missing), and to diff-related\n"
-"commands to highlight additions, removals, diff headers, and trailing\n"
-"whitespace."
-msgstr ""
-
-msgid ""
-"Other effects in addition to color, like bold and underlined text, are\n"
-"also available. Effects are rendered with the ECMA-48 SGR control\n"
-"function (aka ANSI escape codes). This module also provides the\n"
-"render_text function, which can be used to add effects to any text."
-msgstr ""
-
-msgid "Default effects may be overridden from the .hgrc file::"
-msgstr ""
-
-msgid ""
-"  [color]\n"
-"  status.modified = blue bold underline red_background\n"
-"  status.added = green bold\n"
-"  status.removed = red bold blue_background\n"
-"  status.deleted = cyan bold underline\n"
-"  status.unknown = magenta bold underline\n"
-"  status.ignored = black bold"
-msgstr ""
-
-msgid ""
-"  # 'none' turns off all effects\n"
-"  status.clean = none\n"
-"  status.copied = none"
-msgstr ""
-
-msgid ""
-"  qseries.applied = blue bold underline\n"
-"  qseries.unapplied = black bold\n"
-"  qseries.missing = red bold"
-msgstr ""
-
-msgid ""
-"  diff.diffline = bold\n"
-"  diff.extended = cyan bold\n"
-"  diff.file_a = red bold\n"
-"  diff.file_b = green bold\n"
-"  diff.hunk = magenta\n"
-"  diff.deleted = red\n"
-"  diff.inserted = green\n"
-"  diff.changed = white\n"
-"  diff.trailingwhitespace = bold red_background\n"
-msgstr ""
-
-msgid "when to colorize (always, auto, or never)"
-msgstr "quando colorare (sempre, auto o mai)"
-
-#, fuzzy
-msgid "don't colorize output (DEPRECATED)"
-msgstr "non colorare l'output"
-
-#, python-format
-msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
-msgstr ""
-
-#, fuzzy
-msgid "import revisions from foreign VCS repositories into Mercurial"
-msgstr "converte repository di altri VCS in Mercurial"
-
-msgid "convert a foreign SCM repository to a Mercurial one."
-msgstr ""
-
-msgid "    Accepted source formats [identifiers]:"
-msgstr ""
-
-msgid ""
-"    - Mercurial [hg]\n"
-"    - CVS [cvs]\n"
-"    - Darcs [darcs]\n"
-"    - git [git]\n"
-"    - Subversion [svn]\n"
-"    - Monotone [mtn]\n"
-"    - GNU Arch [gnuarch]\n"
-"    - Bazaar [bzr]\n"
-"    - Perforce [p4]"
-msgstr ""
-
-msgid "    Accepted destination formats [identifiers]:"
-msgstr ""
-
-msgid ""
-"    - Mercurial [hg]\n"
-"    - Subversion [svn] (history on branches is not preserved)"
-msgstr ""
-
-msgid ""
-"    If no revision is given, all revisions will be converted.\n"
-"    Otherwise, convert will only import up to the named revision\n"
-"    (given in a format understood by the source)."
-msgstr ""
-
-msgid ""
-"    If no destination directory name is specified, it defaults to the\n"
-"    basename of the source with '-hg' appended. If the destination\n"
-"    repository doesn't exist, it will be created."
-msgstr ""
-
-msgid ""
-"    By default, all sources except Mercurial will use --branchsort.\n"
-"    Mercurial uses --sourcesort to preserve original revision numbers\n"
-"    order. Sort modes have the following effects:"
-msgstr ""
-
-msgid ""
-"    --branchsort  convert from parent to child revision when possible,\n"
-"                  which means branches are usually converted one after\n"
-"                  the other. It generates more compact repositories."
-msgstr ""
-
-msgid ""
-"    --datesort    sort revisions by date. Converted repositories have\n"
-"                  good-looking changelogs but are often an order of\n"
-"                  magnitude larger than the same ones generated by\n"
-"                  --branchsort."
-msgstr ""
-
-msgid ""
-"    --sourcesort  try to preserve source revisions order, only\n"
-"                  supported by Mercurial sources."
-msgstr ""
-
-msgid ""
-"    If  isn't given, it will be put in a default location\n"
-"    (/.hg/shamap by default). The  is a simple text file\n"
-"    that maps each source commit ID to the destination ID for that\n"
-"    revision, like so::"
-msgstr ""
-
-msgid "       "
-msgstr ""
-
-msgid ""
-"    If the file doesn't exist, it's automatically created. It's\n"
-"    updated on each commit copied, so convert-repo can be interrupted\n"
-"    and can be run repeatedly to copy new commits."
-msgstr ""
-
-msgid ""
-"    The [username mapping] file is a simple text file that maps each\n"
-"    source commit author to a destination commit author. It is handy\n"
-"    for source SCMs that use unix logins to identify authors (eg:\n"
-"    CVS). One line per author mapping and the line format is:\n"
-"    srcauthor=whatever string you want"
-msgstr ""
-
-msgid ""
-"    The filemap is a file that allows filtering and remapping of files\n"
-"    and directories. Comment lines start with '#'. Each line can\n"
-"    contain one of the following directives::"
-msgstr ""
-
-msgid "      include path/to/file"
-msgstr ""
-
-msgid "      exclude path/to/file"
-msgstr ""
-
-msgid "      rename from/file to/file"
+"    Comment lines start with '#'. A specificed path matches if it\n"
+"    equals the full relative name of a file or one of its parent\n"
+"    directories. The 'include' or 'exclude' directive with the longest\n"
+"    matching path applies, so line order does not matter."
 msgstr ""
 
 msgid ""
@@ -1383,9 +1036,9 @@
 "    directory, to be included in the destination repository, and the\n"
 "    exclusion of all other files and directories not explicitly\n"
 "    included. The 'exclude' directive causes files or directories to\n"
-"    be omitted. The 'rename' directive renames a file or directory. To\n"
-"    rename from a subdirectory into the root of the repository, use\n"
-"    '.' as the path to rename to."
+"    be omitted. The 'rename' directive renames a file or directory if\n"
+"    is converted. To rename from a subdirectory into the root of the\n"
+"    repository, use '.' as the path to rename to."
 msgstr ""
 
 msgid ""
@@ -1398,7 +1051,10 @@
 "    revision control system whose parents should be modified (same\n"
 "    format as a key in .hg/shamap). The values are the revision IDs\n"
 "    (in either the source or destination revision control system) that\n"
-"    should be used as the new parents for that node."
+"    should be used as the new parents for that node. For example, if\n"
+"    you have merged \"release-1.0\" into \"trunk\", then you should\n"
+"    specify the revision on \"trunk\" as the first parent and the one on\n"
+"    the \"release-1.0\" branch as the second."
 msgstr ""
 
 msgid ""
@@ -1469,7 +1125,16 @@
 "        Specify a regular expression to which commit log messages are\n"
 "        matched. If a match occurs, then the conversion process will\n"
 "        add the most recent revision on the branch indicated in the\n"
-"        regex as the second parent of the changeset."
+"        regex as the second parent of the changeset.\n"
+"    --config hook.cvslog\n"
+"        Specify a Python function to be called at the end of gathering\n"
+"        the CVS log. The function is passed a list with the log entries,\n"
+"        and can modify the entries in-place, or add or delete them.\n"
+"    --config hook.cvschangesets\n"
+"        Specify a Python function to be called after the changesets\n"
+"        are calculated from the the CVS log. The function is passed\n"
+"        a list with the changeset entries, and can modify the changesets\n"
+"        in-place, or add or delete them."
 msgstr ""
 
 msgid ""
@@ -1595,19 +1260,17 @@
 msgid "change branch names while converting"
 msgstr ""
 
-#, fuzzy
 msgid "try to sort changesets by branches"
-msgstr "prova ad ordinare i changeset per data"
+msgstr "prova ad ordinare i changeset per branch"
 
 msgid "try to sort changesets by date"
 msgstr "prova ad ordinare i changeset per data"
 
-#, fuzzy
 msgid "preserve source changesets order"
-msgstr "prova ad ordinare i changeset per data"
+msgstr "preserva l'ordine dei changeset nella sorgente"
 
 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
-msgstr "hg convert [OPZIONI]... SORGENTE [DEST [REVMAP]]"
+msgstr "hg convert [OPZIONE]... SORGENTE [DEST [REVMAP]]"
 
 msgid "only return changes on specified branches"
 msgstr "restituisce solo le modifiche relative alle branch specificate"
@@ -1640,9 +1303,18 @@
 msgstr "ignorato per compatibilità"
 
 msgid "hg debugcvsps [OPTION]... [PATH]..."
-msgstr "hg debugcvsps [OPZIONI]... [PERCORSO]..."
+msgstr "hg debugcvsps [OPZIONE]... [PERCORSO]..."
 
-msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n"
+#, python-format
+msgid "%s does not look like a Bazaar repository"
+msgstr "%s non sembra essere un repository Bazaar"
+
+msgid "Bazaar modules could not be loaded"
+msgstr "Non è stato possibile caricare i moduli Bazaar"
+
+msgid ""
+"warning: lightweight checkouts may cause conversion failures, try with a "
+"regular branch instead.\n"
 msgstr ""
 
 msgid "bzr source type could not be determined\n"
@@ -1662,7 +1334,7 @@
 
 #, python-format
 msgid "cannot find required \"%s\" tool"
-msgstr "impossibile trovare il tool \"%s\""
+msgstr "impossibile trovare il tool richiesto \"%s\""
 
 #, python-format
 msgid "%s error:\n"
@@ -1677,10 +1349,18 @@
 msgstr "impossibile aprire il file di associazione %r: %s"
 
 #, python-format
+msgid "%s: invalid source repository type"
+msgstr "%s: tipo del repository sorgente non valido"
+
+#, python-format
 msgid "%s: missing or unsupported repository"
 msgstr "%s: repository mancante o non supportato"
 
 #, python-format
+msgid "%s: invalid destination repository type"
+msgstr "%s: tipo di repository di destinazione non valido"
+
+#, python-format
 msgid "convert: %s\n"
 msgstr "convert: %s\n"
 
@@ -1688,9 +1368,18 @@
 msgid "%s: unknown repository type"
 msgstr "%s: tipo di repository sconosciuto"
 
-#, fuzzy, python-format
+msgid "getting files"
+msgstr "prelievo dei file"
+
+msgid "revisions"
+msgstr "revisioni"
+
+msgid "scanning"
+msgstr ""
+
+#, python-format
 msgid "unknown sort mode: %s"
-msgstr "risposta CVS sconosciuta: %s"
+msgstr "modalità di ordinamento sconosciuta: %s"
 
 #, python-format
 msgid "cycle detected between %s and %s"
@@ -1711,9 +1400,9 @@
 msgid "mapping author %s to %s\n"
 msgstr "sto associando l'autore %s a %s\n"
 
-#, fuzzy, python-format
+#, python-format
 msgid "overriding mapping for author %s, was %s, will be %s\n"
-msgstr "Rimpiazzo l'associazione per l'autore %s, era %s, sarà %s\n"
+msgstr "rimpiazzo l'associazione per l'autore %s, era %s, sarà %s\n"
 
 #, python-format
 msgid "spliced in %s as parents of %s\n"
@@ -1732,36 +1421,46 @@
 msgid "source: %s\n"
 msgstr "sorgente: %s\n"
 
+msgid "converting"
+msgstr "conversione in corso"
+
 #, python-format
 msgid "assuming destination %s\n"
 msgstr "assumo destinazione %s\n"
 
-#, fuzzy
 msgid "more than one sort mode specified"
-msgstr "troppe opzioni specificate"
+msgstr "più di una modalità di ordinamento specificata"
 
 msgid "--sourcesort is not supported by this data source"
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
+msgid "%s does not look like a CVS checkout"
+msgstr "%s non sembra essere un repository CVS"
+
+#, python-format
 msgid "revision %s is not a patchset number"
-msgstr "la revisione %s non è un numero di patchset o una data"
+msgstr "la revisione %s non è un numero di patchset"
 
 #, python-format
 msgid "connecting to %s\n"
 msgstr "sto connettendomi a %s\n"
 
 msgid "CVS pserver authentication failed"
-msgstr "autenticazione al pserver CVS fallita"
+msgstr "autenticazione pserver CVS fallita"
 
 #, python-format
-msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
+msgid ""
+"unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
 msgstr ""
 
 #, python-format
 msgid "%d bytes missing from remote file"
 msgstr "%d byte mancanti dal file remoto"
 
+msgid "malformed response from CVS"
+msgstr ""
+
 #, python-format
 msgid "cvs server: %s\n"
 msgstr "server cvs: %s\n"
@@ -1773,6 +1472,9 @@
 msgid "collecting CVS rlog\n"
 msgstr "sto collezionando gli rlog CVS\n"
 
+msgid "not a CVS sandbox"
+msgstr ""
+
 #, python-format
 msgid "reading cvs log cache %s\n"
 msgstr "sto leggendo la cache dei log cvs %s\n"
@@ -1801,6 +1503,9 @@
 msgid "revision must be followed by date line"
 msgstr "la revisione deve essere seguita da una riga con la data"
 
+msgid "log cache overlaps with new log entries, re-run without cache."
+msgstr ""
+
 #, python-format
 msgid "writing cvs log cache %s\n"
 msgstr "sto scrivendo la cache dei log cvs %s\n"
@@ -1826,6 +1531,10 @@
 msgstr "%d voci di changeset\n"
 
 #, python-format
+msgid "%s does not look like a darcs repository"
+msgstr "%s non sembra essere un repository darcs"
+
+#, python-format
 msgid "darcs version 2.1 or newer needed (found %r)"
 msgstr ""
 
@@ -1850,7 +1559,26 @@
 msgstr "il repository sorgente non supporta --filemap"
 
 #, python-format
-msgid "%s does not look like a GNU Arch repo"
+msgid "%s does not look like a Git repository"
+msgstr "%s non sembra essere un repository Git"
+
+msgid "cannot retrieve git heads"
+msgstr ""
+
+#, python-format
+msgid "cannot read %r object at %s"
+msgstr ""
+
+#, python-format
+msgid "cannot read changes in %s"
+msgstr "impossibile leggere le modifiche in %s"
+
+#, python-format
+msgid "cannot read tags from %s"
+msgstr "impossibile leggere le tag da %s"
+
+#, python-format
+msgid "%s does not look like a GNU Arch repository"
 msgstr "%s non sembra essere un repository GNU Arch"
 
 msgid "cannot find a GNU Arch tool"
@@ -1861,7 +1589,8 @@
 msgstr "sto analizzando la versione dell'albero %s...\n"
 
 #, python-format
-msgid "tree analysis stopped because it points to an unregistered archive %s...\n"
+msgid ""
+"tree analysis stopped because it points to an unregistered archive %s...\n"
 msgstr ""
 "analisi dell'albero interrotta in quanto punta ad un archivio non\n"
 "      registrato %s...\n"
@@ -1871,7 +1600,7 @@
 msgstr ""
 
 #, python-format
-msgid "%s is not a local Mercurial repo"
+msgid "%s is not a local Mercurial repository"
 msgstr "%s non è un repository locale Mercurial"
 
 #, python-format
@@ -1879,12 +1608,15 @@
 msgstr "sto inizializzando il repository destinatario %s\n"
 
 #, python-format
+msgid "could not create hg repository %s as sink"
+msgstr "impossibile creare il repository hg %s come destinazione"
+
+#, python-format
 msgid "pulling from %s into %s\n"
 msgstr "sto effettuando il pull da %s a %s\n"
 
-#, fuzzy
 msgid "filtering out empty revision\n"
-msgstr "stampa la data revisione"
+msgstr "salto revisione vuota\n"
 
 msgid "updating tags\n"
 msgstr "sto aggiornando le tag\n"
@@ -1898,13 +1630,17 @@
 msgstr "sto ignorando: %s\n"
 
 #, python-format
-msgid "%s does not look like a monotone repo"
+msgid "%s does not look like a monotone repository"
 msgstr "%s non sembra essere un repository monotone"
 
 #, python-format
 msgid "copying file in renamed directory from '%s' to '%s'"
 msgstr ""
 
+#, python-format
+msgid "%s does not look like a P4 repository"
+msgstr "%s non sembra essere un repository P4"
+
 msgid "reading p4 views\n"
 msgstr "sto leggendo le viste p4\n"
 
@@ -1914,15 +1650,27 @@
 msgid "Mercurial failed to run itself, check hg executable is in PATH"
 msgstr ""
 
+msgid ""
+"svn: cannot probe remote repository, assume it could be a subversion "
+"repository. Use --source-type if you know better.\n"
+msgstr ""
+
+#, python-format
+msgid "%s does not look like a Subversion repository"
+msgstr "%s non sembra essere un repository Subversion"
+
 msgid "Subversion python bindings could not be loaded"
 msgstr "Non è stato possibile caricare i binding python per Subversion"
 
 #, python-format
 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
-msgstr "Trovati binding python per Subversion %d.%d, richiesti 1.4 o successivi"
+msgstr ""
+"Trovati binding python per Subversion %d.%d, richiesti 1.4 o successivi"
 
 msgid "Subversion python bindings are too old, 1.4 or later required"
-msgstr "I binding python per Subversion sono troppo vecchi, richiesti 1.4 o successivi"
+msgstr ""
+"I binding python per Subversion sono troppo vecchi, richiesti 1.4 o "
+"successivi"
 
 #, python-format
 msgid "svn: revision %s is not an integer"
@@ -1952,22 +1700,20 @@
 msgid "found branch %s at %d\n"
 msgstr "trovata branch %s in %d\n"
 
-#, fuzzy
 msgid "svn: start revision is not supported with more than one branch"
-msgstr "svn: non è supportata una revisione iniziale con più di una branch"
+msgstr "svn: con più di una branch non è supportata una revisione iniziale"
 
 #, python-format
 msgid "svn: no revision found after start revision %d"
 msgstr "svn: nessuna revisione trovata dopo la revisione iniziale %d"
 
 #, python-format
-msgid "no tags found at revision %d\n"
-msgstr "nessuna tag trovata alla revisione %d\n"
-
-#, python-format
 msgid "%s not found up to revision %d"
 msgstr "%s non trovato fino alla revisione %d"
 
+msgid "scanning paths"
+msgstr "scansione percorsi"
+
 #, python-format
 msgid "found parent of branch %s at %d: %s\n"
 msgstr "trovato genitore della branch %s in %d: %s\n"
@@ -1981,97 +1727,232 @@
 msgstr "svn: la branch non ha nessuna revisione %s"
 
 #, python-format
-msgid "initializing svn repo %r\n"
+msgid "initializing svn repository %r\n"
 msgstr "inizializzo il repository svn %r\n"
 
 #, python-format
-msgid "initializing svn wc %r\n"
-msgstr "inizializzo svn wc %r\n"
+msgid "initializing svn working copy %r\n"
+msgstr "inizializzo working copy svn %r\n"
 
 msgid "unexpected svn output:\n"
 msgstr "output svn inatteso:\n"
 
 msgid "unable to cope with svn output"
-msgstr ""
+msgstr "non sono in grado di gestire l'output di svn"
 
 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
 msgstr "XXX TAG NON ANCORA IMPLEMENTATE\n"
 
-msgid "command to allow external programs to compare revisions"
+msgid "automatically manage newlines in repository files"
 msgstr ""
+"gestisci automaticamente i fine linea nei file contenuti nel repository"
 
 msgid ""
-"The extdiff Mercurial extension allows you to use external programs\n"
-"to compare revisions, or revision with working directory. The external\n"
-"diff programs are called with a configurable set of options and two\n"
-"non-option arguments: paths to directories containing snapshots of\n"
-"files to compare."
+"This extension allows you to manage the type of line endings (CRLF or\n"
+"LF) that are used in the repository and in the local working\n"
+"directory. That way you can get CRLF line endings on Windows and LF on\n"
+"Unix/Mac, thereby letting everybody use their OS native line endings."
 msgstr ""
 
 msgid ""
-"The extdiff extension also allows to configure new diff commands, so\n"
-"you do not need to type \"hg extdiff -p kdiff3\" always. ::"
+"The extension reads its configuration from a versioned ``.hgeol``\n"
+"configuration file every time you run an ``hg`` command. The\n"
+"``.hgeol`` file use the same syntax as all other Mercurial\n"
+"configuration files. It uses two sections, ``[patterns]`` and\n"
+"``[repository]``."
 msgstr ""
 
 msgid ""
-"  [extdiff]\n"
-"  # add new command that runs GNU diff(1) in 'context diff' mode\n"
-"  cdiff = gdiff -Nprc5\n"
-"  ## or the old way:\n"
-"  #cmd.cdiff = gdiff\n"
-"  #opts.cdiff = -Nprc5"
+"The ``[patterns]`` section specifies the line endings used in the\n"
+"working directory. The format is specified by a file pattern. The\n"
+"first match is used, so put more specific patterns first. The\n"
+"available line endings are ``LF``, ``CRLF``, and ``BIN``."
 msgstr ""
 
 msgid ""
-"  # add new command called vdiff, runs kdiff3\n"
-"  vdiff = kdiff3"
+"Files with the declared format of ``CRLF`` or ``LF`` are always\n"
+"checked out in that format and files declared to be binary (``BIN``)\n"
+"are left unchanged. Additionally, ``native`` is an alias for the\n"
+"platform's default line ending: ``LF`` on Unix (including Mac OS X)\n"
+"and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n"
+"endings) is Mercurial's default behaviour; it is only needed if you\n"
+"need to override a later, more general pattern."
 msgstr ""
 
 msgid ""
-"  # add new command called meld, runs meld (no need to name twice)\n"
-"  meld ="
+"The optional ``[repository]`` section specifies the line endings to\n"
+"use for files stored in the repository. It has a single setting,\n"
+"``native``, which determines the storage line endings for files\n"
+"declared as ``native`` in the ``[patterns]`` section. It can be set to\n"
+"``LF`` or ``CRLF``. The default is ``LF``. For example, this means\n"
+"that on Windows, files configured as ``native`` (``CRLF`` by default)\n"
+"will be converted to ``LF`` when stored in the repository. Files\n"
+"declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section\n"
+"are always stored as-is in the repository."
 msgstr ""
 
-msgid ""
-"  # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
-"  # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
-"  # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
-"  # your .vimrc\n"
-"  vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'"
+msgid "Example versioned ``.hgeol`` file::"
 msgstr ""
 
 msgid ""
-"You can use -I/-X and list of file or directory names like normal \"hg\n"
-"diff\" command. The extdiff extension makes snapshots of only needed\n"
-"files, so running the external diff program will actually be pretty\n"
-"fast (at least faster than having to compare the entire tree).\n"
+"  [patterns]\n"
+"  **.py = native\n"
+"  **.vcproj = CRLF\n"
+"  **.txt = native\n"
+"  Makefile = LF\n"
+"  **.jpg = BIN"
 msgstr ""
 
-#, python-format
-msgid "making snapshot of %d files from rev %s\n"
+msgid ""
+"  [repository]\n"
+"  native = LF"
 msgstr ""
 
-#, python-format
-msgid "making snapshot of %d files from working directory\n"
+msgid ""
+"The extension uses an optional ``[eol]`` section in your hgrc file\n"
+"(not the ``.hgeol`` file) for settings that control the overall\n"
+"behavior. There are two settings:"
 msgstr ""
 
-msgid "cannot specify --rev and --change at the same time"
-msgstr "impossibile specificare sia --rev sia --change"
-
-msgid "cleaning up temp directory\n"
-msgstr "sto ripulendo la directory temporanea\n"
-
-msgid "use external program to diff repository (or selected files)"
+msgid ""
+"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n"
+"  ``CRLF`` override the default interpretation of ``native`` for\n"
+"  checkout. This can be used with :hg:`archive` on Unix, say, to\n"
+"  generate an archive where files have line endings for Windows."
 msgstr ""
 
 msgid ""
-"    Show differences between revisions for the specified files, using\n"
-"    an external program. The default program used is diff, with\n"
-"    default options \"-Npru\"."
+"- ``eol.only-consistent`` (default True) can be set to False to make\n"
+"  the extension convert files with inconsistent EOLs. Inconsistent\n"
+"  means that there is both ``CRLF`` and ``LF`` present in the file.\n"
+"  Such files are normally not touched under the assumption that they\n"
+"  have mixed EOLs on purpose."
 msgstr ""
 
 msgid ""
-"    To select a different program, use the -p/--program option. The\n"
+"See :hg:`help patterns` for more information about the glob patterns\n"
+"used.\n"
+msgstr ""
+
+#, python-format
+msgid "%s should not have CRLF line endings"
+msgstr ""
+
+#, python-format
+msgid "%s should not have LF line endings"
+msgstr ""
+
+msgid "the eol extension is incompatible with the win32text extension"
+msgstr ""
+
+#, python-format
+msgid "ignoring unknown EOL style '%s' from %s\n"
+msgstr ""
+
+#, python-format
+msgid "inconsistent newline style in %s\n"
+msgstr ""
+
+msgid "command to allow external programs to compare revisions"
+msgstr ""
+
+msgid ""
+"The extdiff Mercurial extension allows you to use external programs\n"
+"to compare revisions, or revision with working directory. The external\n"
+"diff programs are called with a configurable set of options and two\n"
+"non-option arguments: paths to directories containing snapshots of\n"
+"files to compare."
+msgstr ""
+
+msgid ""
+"The extdiff extension also allows to configure new diff commands, so\n"
+"you do not need to type :hg:`extdiff -p kdiff3` always. ::"
+msgstr ""
+
+msgid ""
+"  [extdiff]\n"
+"  # add new command that runs GNU diff(1) in 'context diff' mode\n"
+"  cdiff = gdiff -Nprc5\n"
+"  ## or the old way:\n"
+"  #cmd.cdiff = gdiff\n"
+"  #opts.cdiff = -Nprc5"
+msgstr ""
+
+msgid ""
+"  # add new command called vdiff, runs kdiff3\n"
+"  vdiff = kdiff3"
+msgstr ""
+
+msgid ""
+"  # add new command called meld, runs meld (no need to name twice)\n"
+"  meld ="
+msgstr ""
+
+msgid ""
+"  # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
+"  # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
+"  # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
+"  # your .vimrc\n"
+"  vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'"
+msgstr ""
+
+msgid "Tool arguments can include variables that are expanded at runtime::"
+msgstr ""
+
+msgid ""
+"  $parent1, $plabel1 - filename, descriptive label of first parent\n"
+"  $child,   $clabel  - filename, descriptive label of child revision\n"
+"  $parent2, $plabel2 - filename, descriptive label of second parent\n"
+"  $parent is an alias for $parent1."
+msgstr ""
+
+msgid ""
+"The extdiff extension will look in your [diff-tools] and [merge-tools]\n"
+"sections for diff tool arguments, when none are specified in [extdiff]."
+msgstr ""
+
+msgid ""
+"  [extdiff]\n"
+"  kdiff3 ="
+msgstr ""
+
+msgid ""
+"  [diff-tools]\n"
+"  kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child"
+msgstr ""
+
+msgid ""
+"You can use -I/-X and list of file or directory names like normal\n"
+":hg:`diff` command. The extdiff extension makes snapshots of only\n"
+"needed files, so running the external diff program will actually be\n"
+"pretty fast (at least faster than having to compare the entire tree).\n"
+msgstr ""
+
+#, python-format
+msgid "making snapshot of %d files from rev %s\n"
+msgstr ""
+
+#, python-format
+msgid "making snapshot of %d files from working directory\n"
+msgstr ""
+
+msgid "cannot specify --rev and --change at the same time"
+msgstr "impossibile specificare sia --rev sia --change"
+
+msgid "cleaning up temp directory\n"
+msgstr "sto ripulendo la directory temporanea\n"
+
+msgid "use external program to diff repository (or selected files)"
+msgstr ""
+
+msgid ""
+"    Show differences between revisions for the specified files, using\n"
+"    an external program. The default program used is diff, with\n"
+"    default options \"-Npru\"."
+msgstr ""
+
+msgid ""
+"    To select a different program, use the -p/--program option. The\n"
 "    program will be passed the names of two directories to compare. To\n"
 "    pass additional options to the program, use -o/--option. These\n"
 "    will be passed before the names of the directories to compare."
@@ -2085,9 +1966,15 @@
 "    to its parent."
 msgstr ""
 
+msgid "CMD"
+msgstr ""
+
 msgid "comparison program to run"
 msgstr "programma per i confronti da eseguire"
 
+msgid "OPT"
+msgstr "OPZIONE"
+
 msgid "pass option to comparison program"
 msgstr "passa l'opzione al programma per i confronti"
 
@@ -2095,78 +1982,73 @@
 msgstr "modifica effettuata dalla revisione"
 
 msgid "hg extdiff [OPT]... [FILE]..."
-msgstr "hg extdiff [OPT]... [FILE]..."
+msgstr "hg extdiff [OPZIONE]... [FILE]..."
 
 #, python-format
 msgid "use %(path)s to diff repository (or selected files)"
 msgstr ""
+"usa %(path)s per creare una diff tra repository (o tra i file selezionati)"
 
 #, python-format
 msgid ""
-"    Show differences between revisions for the specified files, using the\n"
-"    %(path)s program."
-msgstr ""
-
-#, python-format
-msgid ""
-"    When two revision arguments are given, then changes are shown between\n"
-"    those revisions. If only one revision is specified then that revision is\n"
-"    compared to the working directory, and, when no revisions are specified,\n"
-"    the working directory files are compared to its parent."
+"    Show differences between revisions for the specified files, using\n"
+"    the %(path)s program."
 msgstr ""
+"    Mostra differenze tra revisioni per i file specificati, usando\n"
+"    il programma %(path)s."
 
 #, python-format
 msgid "hg %s [OPTION]... [FILE]..."
-msgstr "hg %s [OPZIONI]... [FILE]..."
+msgstr "hg %s [OPZIONE]... [FILE]..."
 
-#, fuzzy
 msgid "pull, update and merge in one command"
 msgstr "pull, update e merge in un comando"
 
-#, fuzzy
 msgid "pull changes from a remote repository, merge new changes if needed."
-msgstr "effettua il pull delle modifiche da un repository remoto, effettua il merge delle nuove modifiche se necessario."
+msgstr ""
+"effettua il pull delle modifiche da un repository remoto, effettua il merge "
+"delle nuove modifiche se necessario."
 
-#, fuzzy
 msgid ""
 "    This finds all changes from the repository at the specified path\n"
 "    or URL and adds them to the local repository."
 msgstr ""
-"    Questo trova tutte le modifiche dal repository al percorso o URL specificato\n"
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
 "    e le aggiunge al repository locale."
 
-#, fuzzy
 msgid ""
 "    If the pulled changes add a new branch head, the head is\n"
 "    automatically merged, and the result of the merge is committed.\n"
 "    Otherwise, the working directory is updated to include the new\n"
 "    changes."
 msgstr ""
-"    Se le modifiche ottenute aggiungono una nuova head, il merge di questa viene effettuato\n"
-"    automaticamente e si effettua il commit del merge.  Altrimenti, la\n"
+"    Se le modifiche ottenute aggiungono una nuova head di branch, il merge "
+"di questa viene effettuato\n"
+"    automaticamente e si effettua il commit del merge. Altrimenti, la\n"
 "    directory di lavoro viene aggiornata per includere le nuove modifiche."
 
-#, fuzzy
 msgid ""
 "    When a merge occurs, the newly pulled changes are assumed to be\n"
 "    \"authoritative\". The head of the new changes is used as the first\n"
 "    parent, with local changes as the second. To switch the merge\n"
 "    order, use --switch-parent."
 msgstr ""
-"    Quando si verifica un merge, si assume che le modifiche appena ottenute siano\n"
-"    \"autoritarie\".  La head delle nuove modifiche è usata come primo\n"
-"    genitore, con le modifiche locali come secondo.  Per invertire l'ordine\n"
+"    Quando si verifica un merge, si assume che le modifiche appena ottenute "
+"siano\n"
+"    \"autoritarie\". La head delle nuove modifiche è usata come primo\n"
+"    genitore, con le modifiche locali come secondo. Per invertire l'ordine\n"
 "    di merge, usare --switch-parent."
 
-#, fuzzy
 msgid ""
-"    See 'hg help dates' for a list of formats valid for -d/--date.\n"
+"    See :hg:`help dates` for a list of formats valid for -d/--date.\n"
 "    "
 msgstr ""
-"    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
+"    Vedere :hg:`help dates` per un elenco dei formati validi per -d/--date.\n"
 "    "
 
-msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)"
+msgid ""
+"working dir not at branch tip (use \"hg update\" to check out branch tip)"
 msgstr ""
 "directory di lavoro non al tip della branch (usa \"hg update\" per\n"
 "      fare il check out della tip della branch)"
@@ -2180,7 +2062,8 @@
 msgid "working directory is missing some files"
 msgstr "alla directory di lavoro mancano alcuni file"
 
-msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
+msgid ""
+"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
 msgstr ""
 "head multiple in questa branch (usa \"hg heads .\" e \"hg merge\"\n"
 "      per fare il merge"
@@ -2189,11 +2072,17 @@
 msgid "pulling from %s\n"
 msgstr "sto facendo pull da %s\n"
 
-msgid "Other repository doesn't support revision lookup, so a rev cannot be specified."
-msgstr "L'altro repository non supporta la ricerca di revisioni, quindi una revisione non può essere specificata."
+msgid ""
+"Other repository doesn't support revision lookup, so a rev cannot be "
+"specified."
+msgstr ""
+"L'altro repository non supporta la ricerca di revisioni, quindi una "
+"revisione non può essere specificata."
 
 #, python-format
-msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n"
+msgid ""
+"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
+"\" to merge them)\n"
 msgstr ""
 
 #, python-format
@@ -2206,7 +2095,9 @@
 
 #, python-format
 msgid "new changeset %d:%s merges remote changes with local\n"
-msgstr "il nuovo changeset %d:%s fa il merge delle modifiche remote con quelle locali\n"
+msgstr ""
+"il nuovo changeset %d:%s fa il merge delle modifiche remote con quelle "
+"locali\n"
 
 msgid "a specific revision you would like to pull"
 msgstr "una specifica revisione di cui si desidera fare il pull"
@@ -2223,9 +2114,8 @@
 msgid "hg fetch [SOURCE]"
 msgstr "hg fetch [SORGENTE]"
 
-#, fuzzy
 msgid "commands to sign and verify changesets"
-msgstr "elenca i changeset firmati"
+msgstr "comandi per firmare e verificare changeset"
 
 msgid "error while verifying signature"
 msgstr "errore durante la verifica della firma"
@@ -2250,7 +2140,8 @@
 msgstr "il nodo %s:%d non esiste\n"
 
 msgid "verify all the signatures there may be for a particular revision"
-msgstr "verifica tutte le firme che potrebbero esistere per una particolare revisione"
+msgstr ""
+"verifica tutte le firme che potrebbero esistere per una particolare revisione"
 
 #, python-format
 msgid "No valid signature for %s\n"
@@ -2268,13 +2159,23 @@
 "    checkout di nessuna revisione."
 
 msgid "uncommitted merge - please provide a specific revision"
-msgstr "merge di cui non si è effettuato il commit - si prega di fornire una revisione specifica"
+msgstr ""
+"merge di cui non si è effettuato il commit - si prega di fornire una "
+"revisione specifica"
+
+#, python-format
+msgid "Signing %d:%s\n"
+msgstr "Firma in corso di %d:%s\n"
 
 msgid "Error while signing"
 msgstr "Errore durante la firma"
 
-msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)"
-msgstr "la copia di lavoro di .hgsigs è cambiata (si prega di fare il commit manualmente di .hgsigs o usare --force)"
+msgid ""
+"working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
+"force)"
+msgstr ""
+"la copia di lavoro di .hgsigs è cambiata (si prega di fare il commit "
+"manualmente di .hgsigs o usare --force)"
 
 msgid "unknown signature version"
 msgstr "versione della firma sconosciuta"
@@ -2288,14 +2189,20 @@
 msgid "do not commit the sigfile after signing"
 msgstr "non effettuare il commit del sigfile dopo la firma"
 
+msgid "ID"
+msgstr ""
+
 msgid "the key id to sign with"
 msgstr "l'id della chiave con cui firmare"
 
+msgid "TEXT"
+msgstr ""
+
 msgid "commit message"
 msgstr "messaggio di commit"
 
 msgid "hg sign [OPTION]... [REVISION]..."
-msgstr "hg sign [OPZIONI]... [REVISIONE]..."
+msgstr "hg sign [OPZIONE]... [REVISIONE]..."
 
 msgid "hg sigcheck REVISION"
 msgstr "hg sigcheck REVISIONE"
@@ -2330,16 +2237,12 @@
 "    "
 msgstr ""
 
-#, python-format
-msgid "comparing with %s\n"
-msgstr "sto confrontando con %s\n"
-
-msgid "no changes found\n"
-msgstr "nessuna modifica trovata\n"
-
 msgid "show the revision DAG"
 msgstr ""
 
+msgid "NUM"
+msgstr ""
+
 msgid "limit number of changes displayed"
 msgstr ""
 
@@ -2350,7 +2253,7 @@
 msgstr ""
 
 msgid "hg glog [OPTION]... [FILE]"
-msgstr "hg glog [OPZIONI]... [FILE]"
+msgstr "hg glog [OPZIONE]... [FILE]"
 
 msgid "hooks for integrating with the CIA.vc notification service"
 msgstr ""
@@ -2397,6 +2300,10 @@
 msgstr ""
 
 #, python-format
+msgid "%s returned an error: %s"
+msgstr ""
+
+#, python-format
 msgid "hgcia: sending update to %s\n"
 msgstr ""
 
@@ -2421,7 +2328,7 @@
 msgstr ""
 
 msgid ""
-"The hg view command will launch the hgk Tcl script. For this command\n"
+"The :hg:`view` command will launch the hgk Tcl script. For this command\n"
 "to work, hgk must be in your search path. Alternately, you can specify\n"
 "the path to hgk in your .hgrc file::"
 msgstr ""
@@ -2495,17 +2402,16 @@
 msgstr "ricerca"
 
 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
-msgstr "hg git-diff-tree [OPZIONI]... NODO1 NODO2 [FILE]..."
+msgstr "hg git-diff-tree [OPZIONE]... NODO1 NODO2 [FILE]..."
 
 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
-msgstr "hg debug-cat-file [OPZIONI]... TIPO FILE"
+msgstr "hg debug-cat-file [OPZIONE]... TIPO FILE"
 
 msgid "hg debug-config"
 msgstr "hg debug-config"
 
-#, fuzzy
 msgid "hg debug-merge-base REV REV"
-msgstr "hg debug-rev-parse REV"
+msgstr ""
 
 msgid "ignored"
 msgstr "ignorato"
@@ -2525,9 +2431,8 @@
 msgid "max-count"
 msgstr "conto massimo"
 
-#, fuzzy
 msgid "hg debug-rev-list [OPTION]... REV..."
-msgstr "hg debugcvsps [OPZIONI]... [PERCORSO]..."
+msgstr "hg debug-rev-list [OPZIONE]... REV..."
 
 msgid "syntax highlighting for hgweb (requires Pygments)"
 msgstr ""
@@ -2581,23 +2486,24 @@
 msgid "hg inserve [OPTION]..."
 msgstr "hg inserve [OPT]..."
 
-msgid "(found dead inotify server socket; removing it)\n"
+#, fuzzy
+msgid "inotify-client: found dead inotify server socket; removing it\n"
 msgstr "(trovato socket morto del server inotify; lo rimuovo)\n"
 
-#, python-format
-msgid "could not start inotify server: %s\n"
+#, fuzzy, python-format
+msgid "inotify-client: could not start inotify server: %s\n"
 msgstr "impossibile avviare il server inotify: %s\n"
 
-#, python-format
-msgid "could not talk to new inotify server: %s\n"
+#, fuzzy, python-format
+msgid "inotify-client: could not talk to new inotify server: %s\n"
 msgstr "impossibile comunicare con il nuovo server inotify: %s\n"
 
-#, python-format
-msgid "failed to contact inotify server: %s\n"
+#, fuzzy, python-format
+msgid "inotify-client: failed to contact inotify server: %s\n"
 msgstr "non sono riuscito a contattare il server inotify: %s\n"
 
 #, fuzzy
-msgid "received empty answer from inotify server"
+msgid "inotify-client: received empty answer from inotify server"
 msgstr "Risposta inaspettata dal server remoto:"
 
 #, python-format
@@ -2635,7 +2541,9 @@
 
 #, python-format
 msgid "cannot watch %s until inotify watch limit is raised"
-msgstr "impossibile controllare %s finchè il limite di controlli di inotify non verrà aumentato"
+msgstr ""
+"impossibile controllare %s finchè il limite di controlli di inotify non "
+"verrà aumentato"
 
 #, python-format
 msgid "inotify service not available: %s"
@@ -2650,21 +2558,6 @@
 msgstr "sto controllando le directory sotto %r\n"
 
 #, python-format
-msgid "status: %r %s -> %s\n"
-msgstr "status: %r %s -> %s\n"
-
-#, python-format
-msgid "%s dirstate reload\n"
-msgstr ""
-
-#, python-format
-msgid "%s end dirstate reload\n"
-msgstr ""
-
-msgid "rescanning due to .hgignore change\n"
-msgstr ""
-
-#, python-format
 msgid "%s event: created %s\n"
 msgstr "evento %s: creato %s\n"
 
@@ -2696,8 +2589,22 @@
 msgid "%s hooking back up with %d bytes readable\n"
 msgstr ""
 
+msgid "finished setup\n"
+msgstr ""
+
 #, python-format
-msgid "could not start server: %s"
+msgid "status: %r %s -> %s\n"
+msgstr "status: %r %s -> %s\n"
+
+msgid "rescanning due to .hgignore change\n"
+msgstr ""
+
+msgid "cannot start: socket is already bound"
+msgstr ""
+
+msgid ""
+"cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/"
+"inotify.sock already exists"
 msgstr ""
 
 #, python-format
@@ -2712,9 +2619,6 @@
 msgid "unrecognized query type: %s\n"
 msgstr "risposta non riconosciuta\n"
 
-msgid "finished setup\n"
-msgstr ""
-
 msgid "expand expressions into changelog and summaries"
 msgstr ""
 
@@ -2732,7 +2636,8 @@
 msgid ""
 "  [interhg]\n"
 "  issues = s!issue(\\d+)!issue\\1!\n"
-"  bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!\\1!i\n"
+"  bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!\\1!"
+"i\n"
 "  boldify = s!(^|\\s)#(\\d+)\\b! #\\2!\n"
 msgstr ""
 
@@ -2759,8 +2664,8 @@
 msgstr ""
 
 msgid ""
-"Configuration is done in the [keyword] and [keywordmaps] sections of\n"
-"hgrc files."
+"Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n"
+"sections of hgrc files."
 msgstr ""
 
 msgid "Example::"
@@ -2774,43 +2679,46 @@
 msgstr ""
 
 msgid ""
+"    [keywordset]\n"
+"    # prefer svn- over cvs-like default keywordmaps\n"
+"    svn = True"
+msgstr ""
+
+msgid ""
 "NOTE: the more specific you are in your filename patterns the less you\n"
 "lose speed in huge repositories."
 msgstr ""
 
 msgid ""
 "For [keywordmaps] template mapping and expansion demonstration and\n"
-"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
+"control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n"
 "available templates and filters."
 msgstr ""
 
+msgid "Three additional date template filters are provided::"
+msgstr ""
+
 msgid ""
-"An additional date template filter {date|utcdate} is provided. It\n"
-"returns a date like \"2006/09/18 15:13:13\"."
+"    utcdate      \"2006/09/18 15:13:13\"\n"
+"    svnutcdate   \"2006-09-18 15:13:13Z\"\n"
+"    svnisodate   \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
 msgstr ""
 
 msgid ""
-"The default template mappings (view with \"hg kwdemo -d\") can be\n"
-"replaced with customized keywords and templates. Again, run \"hg\n"
-"kwdemo\" to control the results of your config changes."
+"The default template mappings (view with :hg:`kwdemo -d`) can be\n"
+"replaced with customized keywords and templates. Again, run\n"
+":hg:`kwdemo` to control the results of your config changes."
 msgstr ""
 
 msgid ""
-"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
+"Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n"
 "the risk of inadvertently storing expanded keywords in the change\n"
 "history."
 msgstr ""
 
 msgid ""
 "To force expansion after enabling it, or a configuration change, run\n"
-"\"hg kwexpand\"."
-msgstr ""
-
-msgid ""
-"Also, when committing with the record extension or using mq's qrecord,\n"
-"be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
-"the files in question to update keyword expansions after all changes\n"
-"have been checked in."
+":hg:`kwexpand`."
 msgstr ""
 
 msgid ""
@@ -2849,10 +2757,13 @@
 msgid "    Use -d/--default to disable current configuration."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"    See \"hg help templates\" for information on templates and filters.\n"
+"    See :hg:`help templates` for information on templates and filters.\n"
 "    "
 msgstr ""
+"    Vedere 'hg help dates' per un elenco dei formati validi per -d/--date.\n"
+"    "
 
 #, fuzzy, python-format
 msgid "creating temporary repository at %s\n"
@@ -2889,7 +2800,7 @@
 "keywords written to %s:\n"
 msgstr ""
 
-msgid "unhooked all commit hooks\n"
+msgid "hg keyword configuration and expansion example"
 msgstr ""
 
 msgid ""
@@ -2923,7 +2834,7 @@
 msgstr ""
 
 msgid ""
-"    See \"hg help keyword\" on how to construct patterns both for\n"
+"    See :hg:`help keyword` on how to construct patterns both for\n"
 "    inclusion and exclusion of files."
 msgstr ""
 
@@ -2945,7 +2856,7 @@
 
 msgid ""
 "    Run before changing/disabling active keywords or if you experience\n"
-"    problems with \"hg import\" or \"hg merge\"."
+"    problems with :hg:`import` or :hg:`merge`."
 msgstr ""
 
 msgid ""
@@ -2963,7 +2874,7 @@
 msgstr ""
 
 msgid "hg kwexpand [OPTION]... [FILE]..."
-msgstr "hg kwexpand [OPZIONI]... [FILE]..."
+msgstr "hg kwexpand [OPZIONE]... [FILE]..."
 
 msgid "show keyword status flags of all files"
 msgstr ""
@@ -2975,52 +2886,95 @@
 msgid "only show unknown (not tracked) files"
 msgstr "mostra solo i file sconosciuti (non tracciati)"
 
-#, fuzzy
-msgid "show keyword status flags of all files (DEPRECATED)"
-msgstr "mostra lo stato di tutti i file"
-
-msgid "only show untracked files (DEPRECATED)"
-msgstr ""
-
 msgid "hg kwfiles [OPTION]... [FILE]..."
-msgstr "hg kwfiles [OPZIONI]... [FILE]..."
+msgstr "hg kwfiles [OPZIONE]... [FILE]..."
 
 msgid "hg kwshrink [OPTION]... [FILE]..."
-msgstr "hg kwshrink [OPZIONI]... [FILE]..."
+msgstr "hg kwshrink [OPZIONE]... [FILE]..."
 
 msgid "manage a stack of patches"
-msgstr ""
+msgstr "gestisci una pila di patch"
 
 msgid ""
 "This extension lets you work with a stack of patches in a Mercurial\n"
 "repository. It manages two stacks of patches - all known patches, and\n"
 "applied patches (subset of known patches)."
 msgstr ""
+"Questa estensione ti permette di gestire una coda di patch per un "
+"repository\n"
+"Mercurial. Essa gestisce due pile di patch - tutte le patch note, e\n"
+"le patch applicate (un sottoinsieme delle patch note)."
 
 msgid ""
 "Known patches are represented as patch files in the .hg/patches\n"
 "directory. Applied patches are both patch files and changesets."
 msgstr ""
+"Le patch note sono rappresentate da file di patch nella directory\n"
+".hg/patches. Le patch applicate sono sia file di patch sia changeset."
 
-msgid "Common tasks (use \"hg help command\" for more details)::"
-msgstr ""
+msgid "Common tasks (use :hg:`help command` for more details)::"
+msgstr "Compiti comuni (usa :hg:`help comando` per maggior dettagli)::"
 
 msgid ""
-"  prepare repository to work with patches   qinit\n"
 "  create new patch                          qnew\n"
 "  import existing patch                     qimport"
 msgstr ""
+"  crea una nuova patch                      qnew\n"
+"  importa una patch esistente               qimport"
 
 msgid ""
 "  print patch series                        qseries\n"
 "  print applied patches                     qapplied"
 msgstr ""
+"  stampa la serie di patch                  qseries\n"
+"  stampa le patch applicate                 qapplied"
 
 msgid ""
 "  add known patch to applied stack          qpush\n"
 "  remove patch from applied stack           qpop\n"
-"  refresh contents of top applied patch     qrefresh\n"
+"  refresh contents of top applied patch     qrefresh"
+msgstr ""
+"  aggiungi patch nota alla pila applicata   qpush\n"
+"  rimuovi patch dalla pila applicata        qpop\n"
+"  aggiorna i contenuti della patch applicata in cima     qrefresh"
+
+msgid ""
+"By default, mq will automatically use git patches when required to\n"
+"avoid losing file mode changes, copy records, binary files or empty\n"
+"files creations or deletions. This behaviour can be configured with::"
 msgstr ""
+"Di default, mq userà automaticamente patch in formato git quando necessario\n"
+"per evitare di perdere modifiche ai permessi dei file, registrazioni di\n"
+"copie, file binari o la creazione o cancellazione di file vuoti. Questo\n"
+"comportamento può essere configurato con::"
+
+msgid ""
+"  [mq]\n"
+"  git = auto/keep/yes/no"
+msgstr ""
+
+msgid ""
+"If set to 'keep', mq will obey the [diff] section configuration while\n"
+"preserving existing git patches upon qrefresh. If set to 'yes' or\n"
+"'no', mq will override the [diff] section and always generate git or\n"
+"regular patches, possibly losing data in the second case."
+msgstr ""
+"Se impostato a 'keep', mq seguirà la configurazione nella sezione\n"
+"[diff] nel mantenere il formato git o meno delle patch esistenti\n"
+"nell'eseguire il comando qrefresh. Se impostato a 'yes' o 'no', mq\n"
+"sovrascriverà la sezione [diff] e genererà sempre patch in formato git o\n"
+"normale, perdendo potenzialmente dati nel secondo caso."
+
+msgid ""
+"You will by default be managing a patch queue named \"patches\". You can\n"
+"create other, independent patch queues with the :hg:`qqueue` command.\n"
+msgstr ""
+"Di default, verrà gestita una coda di patch chiamata \"patches\".\n"
+"Se ne possono creare altre indipendenti, col comando :hg:`qqueue`.\n"
+
+#, python-format
+msgid "mq.git option can be auto/keep/yes/no got %s"
+msgstr "l'opzione mg.git può valere auto/keep/yes/no, impostata a %s"
 
 #, python-format
 msgid "%s appears more than once in %s"
@@ -3075,7 +3029,7 @@
 
 #, python-format
 msgid "patch didn't work out, merging %s\n"
-msgstr ""
+msgstr "patch non ha funzionato, esecuzione del merge di %s\n"
 
 #, python-format
 msgid "update returned %d"
@@ -3103,21 +3057,9 @@
 msgid "applying %s\n"
 msgstr "sto applicando %s\n"
 
-#, fuzzy, python-format
-msgid "unable to read %s\n"
-msgstr "impossibile leggere %s"
-
 #, python-format
-msgid "imported patch %s\n"
-msgstr "patch %s importata\n"
-
-#, python-format
-msgid ""
-"\n"
-"imported patch %s"
-msgstr ""
-"\n"
-"patch %s importata"
+msgid "unable to read %s\n"
+msgstr "impossibile leggere %s\n"
 
 #, python-format
 msgid "patch %s is empty\n"
@@ -3125,83 +3067,86 @@
 
 msgid "patch failed, rejects left in working dir\n"
 msgstr ""
+"patch fallita, frammenti rifiutati lasciati nella directory di lavoro\n"
 
 msgid "fuzz found when applying patch, stopping\n"
-msgstr ""
+msgstr "trovato fuzz nell'applicare la patch, arresto\n"
 
 #, python-format
 msgid "revision %d is not managed"
-msgstr ""
+msgstr "la revisione %d non è gestita"
 
 #, python-format
 msgid "cannot delete revision %d above applied patches"
-msgstr ""
+msgstr "impossibile cancellare la revisione %d sopra patch applicate"
 
-#, fuzzy, python-format
+#, python-format
 msgid "patch %s finalized without changeset message\n"
-msgstr "mostra solo i file senza modifiche"
+msgstr "patch %s finalizzata senza un messaggio di changeset\n"
 
 msgid "qdelete requires at least one revision or patch name"
 msgstr ""
 
 #, python-format
 msgid "cannot delete applied patch %s"
-msgstr ""
+msgstr "impossibile rimuovere la patch applicata %s"
 
 #, python-format
 msgid "patch %s not in series file"
-msgstr ""
+msgstr "la patch %s non è nel file series"
 
 msgid "no patches applied"
-msgstr ""
+msgstr "nessuna patch applicata"
 
 msgid "working directory revision is not qtip"
-msgstr ""
+msgstr "la revisione della directory di lavoro non è qtip"
 
 msgid "local changes found, refresh first"
-msgstr ""
+msgstr "trovate modifiche locali, effettuare prima un refresh"
 
 msgid "local changes found"
-msgstr ""
+msgstr "trovate modifiche locali"
 
 #, python-format
 msgid "\"%s\" cannot be used as the name of a patch"
-msgstr ""
+msgstr "\"%s\" non può essere usato come nome di una patch"
 
 #, python-format
 msgid "patch \"%s\" already exists"
-msgstr "la patch \"%s\" esiste gi"
+msgstr "la patch \"%s\" esiste già"
+
+msgid "cannot manage merge changesets"
+msgstr "impossibile gestire un changeset di merge"
 
 #, python-format
 msgid "error unlinking %s\n"
-msgstr ""
+msgstr "errore nella cancellazione di %s\n"
 
 #, python-format
 msgid "patch name \"%s\" is ambiguous:\n"
-msgstr "il nome della patch \"%s\"  ambiguo:\n"
+msgstr "il nome della patch \"%s\" è ambiguo:\n"
 
 #, python-format
 msgid "patch %s not in series"
-msgstr "la patch %s non  nella serie"
+msgstr "la patch %s non è nel file series"
 
-#, fuzzy
 msgid "(working directory not at a head)\n"
-msgstr "(directory di lavoro non  tip)\n"
+msgstr "(la directory di lavoro non è a una head)\n"
 
 msgid "no patches in series\n"
 msgstr "nessuna patch nella serie\n"
 
 #, python-format
 msgid "cannot push to a previous patch: %s"
-msgstr "impossibile fare push su una patch precedente: %s"
+msgstr "impossibile fare push fino a una patch precedente: %s"
 
 #, python-format
 msgid "qpush: %s is already at the top\n"
-msgstr "qpush: %s  gi in cima\n"
+msgstr "qpush: %s è già in cima\n"
 
 #, python-format
 msgid "guarded by %r"
-msgstr "controllato da %r"
+msgstr "controllato dalla guardia %r"
 
 msgid "no matching guards"
 msgstr "nessuna guardia corrispondente"
@@ -3214,14 +3159,18 @@
 msgstr "tutte le patch sono correntemente applicate\n"
 
 msgid "patch series already fully applied\n"
-msgstr "la serie di patch  gi stata applicata completamente\n"
+msgstr "la serie di patch è già stata applicata completamente\n"
+
+msgid "please specify the patch to move"
+msgstr "si prega di specificare la patch da spostare"
 
 msgid "cleaning up working directory..."
 msgstr "sto pulendo la directory di lavoro..."
 
 #, python-format
 msgid "errors during apply, please fix and refresh %s\n"
-msgstr "errori durante l'applicazione, si prega di correggere e aggiornare %s\n"
+msgstr ""
+"errori durante l'applicazione, si prega di correggere e aggiornare %s\n"
 
 #, python-format
 msgid "now at: %s\n"
@@ -3229,50 +3178,56 @@
 
 #, python-format
 msgid "patch %s is not applied"
-msgstr "la patch %s non  applicata"
+msgstr "la patch %s non è applicata"
 
 msgid "no patches applied\n"
 msgstr "nessuna patch applicata\n"
 
 #, python-format
 msgid "qpop: %s is already at the top\n"
-msgstr ""
+msgstr "qpop: %s è già in cima\n"
 
 msgid "qpop: forcing dirstate update\n"
-msgstr ""
+msgstr "qpop: forzatura aggiornamento dirstate\n"
 
 #, python-format
 msgid "trying to pop unknown node %s"
-msgstr ""
+msgstr "tentativo rimozione dalla cima del nodo sconosciuto %s"
 
 msgid "popping would remove a revision not managed by this patch queue"
 msgstr ""
+"la rimozione dalla cima cancellerebbe una revisione non gestita da\n"
+"questa coda di patch"
 
 msgid "deletions found between repo revs"
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "popping %s\n"
-msgstr "sto applicando %s\n"
+msgstr "sto rimuovendo %s dalla cima\n"
 
 msgid "patch queue now empty\n"
-msgstr ""
+msgstr "coda di patch ora vuota\n"
 
 msgid "cannot refresh a revision with children"
-msgstr ""
+msgstr "impossibile aggiornare una revisione con figli"
 
-msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n"
+msgid ""
+"refresh interrupted while patch was popped! (revert --all, qpush to "
+"recover)\n"
 msgstr ""
+"aggiornamento patch interrotto mentre la patch veniva rimossa dalla\n"
+"cima! (revert --all, qpush per recuperare)\n"
 
 msgid "patch queue directory already exists"
-msgstr ""
+msgstr "la directory per la coda di patch esiste già"
 
 #, python-format
 msgid "patch %s is not in series file"
-msgstr ""
+msgstr "la patch %s non è nel file series"
 
 msgid "No saved patch data found\n"
-msgstr ""
+msgstr "Non è stata trovata nessuna modifica salvata\n"
 
 #, python-format
 msgid "restoring status: %s\n"
@@ -3290,7 +3245,7 @@
 msgstr ""
 
 msgid "queue directory updating\n"
-msgstr ""
+msgstr "aggiornamento directory della coda\n"
 
 msgid "Unable to load queue repository\n"
 msgstr "Impossibile caricare il repository della coda\n"
@@ -3309,7 +3264,7 @@
 
 #, python-format
 msgid "patch %s is already in the series file"
-msgstr "la patch %s  gi nel file series"
+msgstr "la patch %s è già nel file series"
 
 msgid "option \"-r\" not valid when importing files"
 msgstr "l'opzione \"-r\" non è valida quando si importano file"
@@ -3339,10 +3294,10 @@
 
 #, python-format
 msgid "revision %d is not the parent of %d"
-msgstr "la revisione %d non  il genitore di %d"
+msgstr "la revisione %d non è il genitore di %d"
 
 msgid "-e is incompatible with import from -"
-msgstr "-e  incompatibile con l'import da -"
+msgstr "-e è incompatibile con l'import da -"
 
 #, python-format
 msgid "patch %s does not exist"
@@ -3352,6 +3307,10 @@
 msgstr "necessario --name per importare una patch da -"
 
 #, python-format
+msgid "unable to read file %s"
+msgstr "impossibile leggere file %s"
+
+#, python-format
 msgid "adding %s to series file\n"
 msgstr "sto aggiungendo %s al file series\n"
 
@@ -3359,17 +3318,18 @@
 msgstr ""
 
 msgid ""
-"    The patches must not be applied, and at least one patch is required. With\n"
+"    The patches must not be applied, and at least one patch is required. "
+"With\n"
 "    -k/--keep, the patch files are preserved in the patch directory."
 msgstr ""
 
 msgid ""
 "    To stop managing a patch and move it into permanent history,\n"
-"    use the qfinish command."
+"    use the :hg:`qfinish` command."
 msgstr ""
 
 msgid "print the patches already applied"
-msgstr "stampa le patch gi applicate"
+msgstr "stampa le patch già applicate"
 
 msgid "only one patch applied\n"
 msgstr " stata applicata solo una patch\n"
@@ -3381,7 +3341,7 @@
 msgstr "tutte le patch sono state applicate\n"
 
 msgid "import a patch"
-msgstr ""
+msgstr "importa una patch"
 
 msgid ""
 "    The patch is inserted into the series after the last applied\n"
@@ -3420,11 +3380,9 @@
 "    "
 msgstr ""
 
-#, fuzzy
-msgid "init a new queue repository"
-msgstr "inizializza un nuovo repository della coda"
+msgid "init a new queue repository (DEPRECATED)"
+msgstr "inizializza un nuovo repository della coda (DEPRECATO)"
 
-#, fuzzy
 msgid ""
 "    The queue repository is unversioned by default. If\n"
 "    -c/--create-repo is specified, qinit will create a separate nested\n"
@@ -3432,16 +3390,23 @@
 "    an unversioned patch repository into a versioned one). You can use\n"
 "    qcommit to commit changes to this queue repository."
 msgstr ""
-"    Il repository della coda di default non è sotto controllo di\n"
-"    versione. Se viene specificato -c, qinit creerà un separato\n"
-"    repository annidato per le patch (qinit -c potrebbe anche essere\n"
-"    eseguito in seguito per convertire un repository non gestito in\n"
+"    Il repository della coda, di default, non è sotto controllo di\n"
+"    versione. Se viene specificato -c/--create-repo, qinit creerà un\n"
+"    repository annidato separato per le patch (qinit -c potrebbe anche\n"
+"    essere eseguito in seguito per convertire un repository non gestito in\n"
 "    uno gestito).\n"
 "    Si può usare qcommit per effettuare il commit delle modifiche in\n"
 "    questo repository della coda."
 
-msgid "clone main and patch repository at same time"
+msgid ""
+"    This command is deprecated. Without -c, it's implied by other relevant\n"
+"    commands. With -c, use :hg:`init --mq` instead."
 msgstr ""
+"    Questo comando è deprecated. Senza -c, è implicito negli altri comandi\n"
+"    relativi. Con -c, è stato rimpiazzato da :hg:`init --mq`."
+
+msgid "clone main and patch repository at same time"
+msgstr "clona assieme il repository principale e quello delle patch"
 
 msgid ""
 "    If source is local, destination will have no patches applied. If\n"
@@ -3458,31 +3423,33 @@
 
 msgid ""
 "    The patch directory must be a nested Mercurial repository, as\n"
-"    would be created by qinit -c.\n"
+"    would be created by :hg:`init --mq`.\n"
 "    "
 msgstr ""
 
-msgid "versioned patch repository not found (see qinit -c)"
-msgstr "repository delle patch sotto controllo di versione non trovato (vedere qinit -c)"
+msgid "versioned patch repository not found (see init --mq)"
+msgstr ""
+"repository delle patch sotto controllo di versione non trovato (vedere init "
+"--mq)"
 
-#, fuzzy
 msgid "cloning main repository\n"
-msgstr "sto clonando il repository principale\n"
+msgstr "clonazione del repository principale\n"
 
-#, fuzzy
 msgid "cloning patch repository\n"
-msgstr "sto clonando il repository delle patch\n"
+msgstr "clonazione del repository delle patch\n"
 
-#, fuzzy
 msgid "stripping applied patches from destination repository\n"
-msgstr "sto rimuovendo le patch applicate dal repository di destinazione\n"
+msgstr "rimozione delle patch applicate dal repository di destinazione\n"
 
-#, fuzzy
 msgid "updating destination repository\n"
-msgstr "sto aggiornando il repository di destinazione\n"
+msgstr "aggiornamento del repository di destinazione\n"
 
-msgid "commit changes in the queue repository"
-msgstr "effettua il commit delle modifiche nel repository della coda"
+msgid "commit changes in the queue repository (DEPRECATED)"
+msgstr ""
+"effettua il commit delle modifiche nel repository della coda (DEPRECATO)"
+
+msgid "    This command is deprecated; use :hg:`commit --mq` instead."
+msgstr "    Questo comando è deprecato; usa invece :hg:`commit --mq`."
 
 msgid "print the entire series file"
 msgstr "stampa l'intero file series"
@@ -3496,51 +3463,45 @@
 msgid "print the name of the previous patch"
 msgstr "stampa il nome della patch precedente"
 
-#, fuzzy
 msgid "create a new patch"
 msgstr "crea una nuova patch"
 
-#, fuzzy
 msgid ""
 "    qnew creates a new patch on top of the currently-applied patch (if\n"
-"    any). It will refuse to run if there are any outstanding changes\n"
-"    unless -f/--force is specified, in which case the patch will be\n"
-"    initialized with them. You may also use -I/--include,\n"
+"    any). The patch will be initialized with any outstanding changes\n"
+"    in the working directory. You may also use -I/--include,\n"
 "    -X/--exclude, and/or a list of files after the patch name to add\n"
 "    only changes to matching files to the new patch, leaving the rest\n"
 "    as uncommitted modifications."
 msgstr ""
 "    qnew crea una nuova patch sopra alla patch correntemente applicata\n"
-"    (seesiste).\n"
-"    Si rifiuter di farlo se ci sono modifiche pendenti a meno che -f\n"
-"    non sia stato specificato, nel qual caso la patch sar\n"
-"    inizializzata con tali modifiche. Si potrebbe anche usare -I, -X,\n"
-"    e/o una lista di file dopo il nome della patch per aggiungere alla\n"
-"    patch solamente le modifiche a tali file, lasciando il resto come\n"
-"    cambiamenti non salvati."
+"    (se esiste). La patch verrà inizializzata con le eventuali modifiche\n"
+"    pendenti nella directory di lavoro. È possibile anche usare\n"
+"    -I/--include, -X/--exclude e/o una lista di file dopo il nome\n"
+"    della patch, per aggiungere alla nuova patch solamente le modifiche a\n"
+"    tali file, lasciando il resto come cambiamenti non salvati."
 
-#, fuzzy
 msgid ""
 "    -u/--user and -d/--date can be used to set the (given) user and\n"
 "    date, respectively. -U/--currentuser and -D/--currentdate set user\n"
 "    to current user and date to current date."
 msgstr ""
-"    -u e -d possono essere usati per impostare rispettivamente un dato\n"
-"    utente e data.\n"
-"    -U e -D impostano l'utente all'utente corrente e la data alla data\n"
-"    corrente."
+"    -u/--user e -d/--date possono essere usati per impostare "
+"rispettivamente\n"
+"    un dato utente e data.\n"
+"    -U/--currentuser e -D/--currentdate impostano l'utente all'utente\n"
+"    corrente e la data alla data corrente."
 
-#, fuzzy
 msgid ""
 "    -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
 "    well as the commit message. If none is specified, the header is\n"
 "    empty and the commit message is '[mq]: PATCH'."
 msgstr ""
-"    -e, -m o -l impostano l'intestazione della patch cos come il\n"
-"    messaggio di commit. Se nulla stato specificato, l'intestazione\n"
-"    sar vuota e il messaggio di commit '[mq]: PATCH'."
+"    -e/--edit, -m/--message o -l/--logfile impostano l'intestazione\n"
+"    della patch così come il messaggio di commit. Se nulla è stato\n"
+"    specificato, l'intestazione sarà vuota e il messaggio di commit\n"
+"    '[mq]: PATCH'."
 
-#, fuzzy
 msgid ""
 "    Use the -g/--git option to keep the patch in the git extended diff\n"
 "    format. Read the diffs help topic for more information on why this\n"
@@ -3548,14 +3509,14 @@
 "    information.\n"
 "    "
 msgstr ""
-"    Usa l'opzione --git per mantenere la patch nel formato diff esteso\n"
+"    Usa l'opzione -g/--git per mantenere la patch nel formato diff esteso\n"
 "    git. Leggere le informazioni di aiuto sui diff per maggiori\n"
-"    informazioni sul motivo per cui quest'opzione importante per\n"
-"    preservare modifiche di permessi e informazioni su copie/rinomine.\n"
+"    informazioni sul perché quest'opzione è importante per preservare\n"
+"    modifiche di permessi e informazioni su copie/rinomine.\n"
 "    "
 
 msgid "update the current patch"
-msgstr ""
+msgstr "aggiorna la patch corrente"
 
 msgid ""
 "    If any file patterns are provided, the refreshed patch will\n"
@@ -3590,15 +3551,15 @@
 msgstr ""
 
 msgid ""
-"    Use 'hg diff' if you only want to see the changes made since the\n"
-"    last qrefresh, or 'hg export qtip' if you want to see changes made\n"
-"    by the current patch without including changes made since the\n"
+"    Use :hg:`diff` if you only want to see the changes made since the\n"
+"    last qrefresh, or :hg:`export qtip` if you want to see changes\n"
+"    made by the current patch without including changes made since the\n"
 "    qrefresh.\n"
 "    "
 msgstr ""
 
 msgid "fold the named patches into the current patch"
-msgstr ""
+msgstr "ripiega le patch indicate in quella corrente"
 
 msgid ""
 "    Patches must not yet be applied. Each patch will be successively\n"
@@ -3615,7 +3576,7 @@
 msgstr ""
 
 msgid "qfold requires at least one patch name"
-msgstr ""
+msgstr "qfold richiede almeno un nome di patch"
 
 msgid "No patches applied"
 msgstr "Nessuna patch applicata"
@@ -3634,15 +3595,18 @@
 
 msgid "push or pop patches until named patch is at top of stack"
 msgstr ""
+"applica o rimuove delle patch finché la patch indicata si trova in cima alla "
+"pila"
 
 msgid "set or print guards for a patch"
-msgstr ""
+msgstr "imposta o stampa le guardie per una patch"
 
 msgid ""
 "    Guards control whether a patch can be pushed. A patch with no\n"
 "    guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
-"    pushed only if the qselect command has activated it. A patch with\n"
-"    a negative guard (\"-foo\") is never pushed if the qselect command\n"
+"    pushed only if the :hg:`qselect` command has activated it. A patch with\n"
+"    a negative guard (\"-foo\") is never pushed if the :hg:`qselect` "
+"command\n"
 "    has activated it."
 msgstr ""
 
@@ -3652,9 +3616,11 @@
 "    NOTE: Specifying negative guards now requires '--'."
 msgstr ""
 
+msgid "    To set guards on another patch::"
+msgstr ""
+
 msgid ""
-"    To set guards on another patch:\n"
-"      hg qguard -- other.patch +2.6.17 -stable\n"
+"      hg qguard other.patch -- +2.6.17 -stable\n"
 "    "
 msgstr ""
 
@@ -3719,12 +3685,18 @@
 msgid "A patch named %s already exists in the series file"
 msgstr "Una patch chiamata %s esiste già nel file series"
 
-#, fuzzy
-msgid "restore the queue state saved by a revision"
-msgstr "ripristina lo stato della coda salvato da una revisione"
+#, python-format
+msgid "renaming %s to %s\n"
+msgstr "sto rinominando %s in %s\n"
+
+msgid "restore the queue state saved by a revision (DEPRECATED)"
+msgstr "ripristina lo stato della coda salvato da una revisione (DEPRECATO)"
+
+msgid "    This command is deprecated, use rebase --mq instead."
+msgstr "    Questo comando è deprecato, usare invece rebase --mq."
 
-msgid "save current queue state"
-msgstr "salva lo stato corrente della coda"
+msgid "save current queue state (DEPRECATED)"
+msgstr "salva lo stato corrente della coda (DEPRECATO)"
 
 #, python-format
 msgid "destination %s exists and is not a directory"
@@ -3738,31 +3710,52 @@
 msgid "copy %s to %s\n"
 msgstr "copia %s a %s\n"
 
-#, fuzzy
-msgid "strip a revision and all its descendants from the repository"
+msgid "strip a changeset and all its descendants from the repository"
 msgstr "elimina una revisione e tutti i suoi discendenti dal repository"
 
-#, fuzzy
 msgid ""
-"    If one of the working directory's parent revisions is stripped, the\n"
-"    working directory will be updated to the parent of the stripped\n"
-"    revision.\n"
-"    "
+"    The strip command removes all changesets whose local revision\n"
+"    number is greater than or equal to REV, and then restores any\n"
+"    changesets that are not descendants of REV. If the working\n"
+"    directory has uncommitted changes, the operation is aborted unless\n"
+"    the --force flag is supplied."
+msgstr ""
+
+msgid ""
+"    If a parent of the working directory is stripped, then the working\n"
+"    directory will automatically be updated to the most recent\n"
+"    available ancestor of the stripped parent after the operation\n"
+"    completes."
 msgstr ""
 "    Se una delle revisioni genitore della directory di lavoro\n"
-"    viene rimossa, la directory di lavorò sarà aggiornata al\n"
-"    genitore della revisione rimossa.\n"
+"    viene rimossa, la directory di lavorò sarà aggiornata automaticamente,\n"
+"    dopo il completamento dell'operazione, all'antenato più recente\n"
+"    disponibile del genitore rimosso."
+
+msgid ""
+"    Any stripped changesets are stored in ``.hg/strip-backup`` as a\n"
+"    bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n"
+"    be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,\n"
+"    where BUNDLE is the bundle file created by the strip. Note that\n"
+"    the local revision numbers will in general be different after the\n"
+"    restore."
+msgstr ""
+
+msgid ""
+"    Use the --nobackup option to discard the backup bundle once the\n"
+"    operation completes.\n"
 "    "
+msgstr ""
 
 msgid "set or print guarded patches to push"
-msgstr ""
+msgstr "imposta o stampa le patch controllate da guardia"
 
 msgid ""
-"    Use the qguard command to set or print guards on patch, then use\n"
+"    Use the :hg:`qguard` command to set or print guards on patch, then use\n"
 "    qselect to tell mq which guards to use. A patch will be pushed if\n"
 "    it has no guards or any positive guards match the currently\n"
 "    selected guard, but will not be pushed if any negative guards\n"
-"    match the current guard. For example:"
+"    match the current guard. For example::"
 msgstr ""
 
 msgid ""
@@ -3806,11 +3799,13 @@
 
 #, python-format
 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
-msgstr "il numero di patch non applicate, senza guardia è cambiato da %d a %d\n"
+msgstr ""
+"il numero di patch non applicate, senza guardia è cambiato da %d a %d\n"
 
 #, python-format
 msgid "number of guarded, applied patches has changed from %d to %d\n"
-msgstr "il numero di patch applicate aventi guardia è cambiato da %d a %d\n"
+msgstr ""
+"il numero di patch applicate controllate da guardia è cambiato da %d a %d\n"
 
 msgid "guards in series file:\n"
 msgstr "guardie nel file series:\n"
@@ -3825,10 +3820,10 @@
 msgstr "nessuna guardia attiva\n"
 
 msgid "popping guarded patches\n"
-msgstr "sto disapplicando patch che hanno una guardia\n"
+msgstr "sto disapplicando patch controllate da una guardia\n"
 
 msgid "reapplying unguarded patches\n"
-msgstr "sto riapplicando patch che non hanno guardia\n"
+msgstr "sto riapplicando patch che non sono controllate da una guardia\n"
 
 msgid "move applied patches into repository history"
 msgstr ""
@@ -3856,6 +3851,58 @@
 msgid "no revisions specified"
 msgstr "nessuna revisione specificata"
 
+msgid "manage multiple patch queues"
+msgstr ""
+
+msgid ""
+"    Supports switching between different patch queues, as well as creating\n"
+"    new patch queues and deleting existing ones."
+msgstr ""
+
+msgid ""
+"    Omitting a queue name or specifying -l/--list will show you the "
+"registered\n"
+"    queues - by default the \"normal\" patches queue is registered. The "
+"currently\n"
+"    active queue will be marked with \"(active)\"."
+msgstr ""
+
+msgid ""
+"    To create a new queue, use -c/--create. The queue is automatically made\n"
+"    active, except in the case where there are applied patches from the\n"
+"    currently active queue in the repository. Then the queue will only be\n"
+"    created and switching will fail."
+msgstr ""
+
+msgid ""
+"    To delete an existing queue, use --delete. You cannot delete the "
+"currently\n"
+"    active queue.\n"
+"    "
+msgstr ""
+
+msgid "patches applied - cannot set new queue active"
+msgstr ""
+
+msgid " (active)\n"
+msgstr ""
+
+msgid "invalid queue name, may not contain the characters \":\\/.\""
+msgstr ""
+
+#, python-format
+msgid "queue \"%s\" already exists"
+msgstr "la coda \"%s\" esiste già"
+
+msgid "cannot delete queue that does not exist"
+msgstr "impossibile cancellare una coda che non esiste"
+
+msgid "cannot delete currently active queue"
+msgstr "impossibile cancellare la coda correntemente attiva"
+
+msgid "use --create to create a new queue"
+msgstr "usa --create per creare una nuova coda"
+
 msgid "cannot commit over an applied mq patch"
 msgstr "impossibile effettuare commit su una patch mq applicata"
 
@@ -3873,16 +3920,37 @@
 msgid "cannot import over an applied patch"
 msgstr "impossibile importare sopra ad una patch applicata"
 
+msgid "only a local queue repository may be initialized"
+msgstr "solo un repository locale della coda può essere inizializzato"
+
+msgid "There is no Mercurial repository here (.hg not found)"
+msgstr "Non esiste alcun repository Mercurial qui (.hg non trovata)"
+
+msgid "no queue repository"
+msgstr "nessun repository della coda"
+
+#, python-format
+msgid "%d applied"
+msgstr "%d applicate"
+
+#, python-format
+msgid "%d unapplied"
+msgstr "%d non applicate"
+
+msgid "mq:     (empty queue)\n"
+msgstr "mq:     (coda vuota)\n"
+
+msgid "operate on patch repository"
+msgstr "opera sul repository delle patch"
+
 msgid "print first line of patch header"
 msgstr "stampa la prima riga dell'intestazione della patch"
 
-#, fuzzy
 msgid "show only the last patch"
-msgstr "mostra solo i file aggiunti"
+msgstr "mostra solo l'ultima patch"
 
-#, fuzzy
 msgid "hg qapplied [-1] [-s] [PATCH]"
-msgstr "hg qapplied [-s] [PATCH]"
+msgstr ""
 
 msgid "use pull protocol to copy metadata"
 msgstr "usa il protocollo pull per copiare i metadati"
@@ -3893,34 +3961,35 @@
 msgid "use uncompressed transfer (fast over LAN)"
 msgstr "usa trasferimento non compresso (veloce su LAN)"
 
-#, fuzzy
+msgid "REPO"
+msgstr ""
+
 msgid "location of source patch repository"
-msgstr "posizione del repository delle patch sorgente"
+msgstr "posizione del repository sorgente delle patch"
 
 msgid "hg qclone [OPTION]... SOURCE [DEST]"
-msgstr "hg qclone [OPZIONI]... SORGENTE [DEST]"
+msgstr "hg qclone [OPZIONE]... SORGENTE [DEST]"
 
 msgid "hg qcommit [OPTION]... [FILE]..."
-msgstr "hg qcommit [OPZIONI]... [FILE]..."
+msgstr "hg qcommit [OPZIONE]... [FILE]..."
 
 msgid "hg qdiff [OPTION]... [FILE]..."
-msgstr "hg qdiff [OPZIONI]... [FILE]..."
+msgstr "hg qdiff [OPZIONE]... [FILE]..."
 
 msgid "keep patch file"
 msgstr "mantieni il file della patch"
 
-#, fuzzy
 msgid "stop managing a revision (DEPRECATED)"
-msgstr "smetti di gestire una revisione"
+msgstr "smetti di gestire una revisione (DEPRECATO)"
 
 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
-msgstr "hg qdelete [-k] [-r REV]... [PATCH]..."
+msgstr ""
 
 msgid "edit patch header"
 msgstr "modifica l'intestazione della patch"
 
 msgid "keep folded patch files"
-msgstr ""
+msgstr "mantieni il file della patch ripiegata"
 
 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
 msgstr "hg qfold [-e] [-k] [-m TESTO] [-l FILE] PATCH..."
@@ -3929,7 +3998,7 @@
 msgstr "sovrascrivi ogni modifica locale"
 
 msgid "hg qgoto [OPTION]... PATCH"
-msgstr "hg qgoto [OPZIONI]... PATCH"
+msgstr "hg qgoto [OPZIONE]... PATCH"
 
 msgid "list all patches and guards"
 msgstr "elenca tutte le patch e le guardie"
@@ -3937,7 +4006,8 @@
 msgid "drop all guards"
 msgstr "scarta tutte le guardie"
 
-msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
+#, fuzzy
+msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
 msgstr "hg qguard [-l] [-n] -- [PATCH] [+GUARDIA]... [-GUARDIA]..."
 
 msgid "hg qheader [PATCH]"
@@ -3973,22 +4043,29 @@
 msgid "hg qinit [-c]"
 msgstr "hg qinit [-c]"
 
-msgid "import uncommitted changes into patch"
-msgstr "importa nella patch le modifiche di cui non si è effettuato il commit"
+#, fuzzy
+msgid "import uncommitted changes (DEPRECATED)"
+msgstr "modifica il messaggio di commit (DEPRECATO)"
 
 msgid "add \"From: \" to patch"
 msgstr "aggiunge \"Da: \" alla patch"
 
-msgid "add \"From: \" to patch"
+msgid "USER"
+msgstr ""
+
+#, fuzzy
+msgid "add \"From: \" to patch"
 msgstr "aggiunge \"Da: \" alla patch"
 
 msgid "add \"Date: \" to patch"
 msgstr "aggiunge \"Data: \" alla patch"
 
-msgid "add \"Date: \" to patch"
+#, fuzzy
+msgid "add \"Date: \" to patch"
 msgstr "aggiunge \"Data: \" alla patch"
 
-msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
+#, fuzzy
+msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
 msgstr "hg qnew [-e] [-m TESTO] [-l FILE] [-f] PATCH [FILE]..."
 
 msgid "hg qnext [-s]"
@@ -4000,7 +4077,8 @@
 msgid "pop all patches"
 msgstr "disapplica tutte le patch"
 
-msgid "queue name to pop"
+#, fuzzy
+msgid "queue name to pop (DEPRECATED)"
 msgstr "nome della coda da disapplicare"
 
 #, fuzzy
@@ -4019,13 +4097,19 @@
 msgid "apply all patches"
 msgstr "applica tutte le patch"
 
-msgid "merge from another queue"
+#, fuzzy
+msgid "merge from another queue (DEPRECATED)"
 msgstr "effettua il merge da un'altra coda"
 
-msgid "merge queue name"
+#, fuzzy
+msgid "merge queue name (DEPRECATED)"
 msgstr "nome della coda del merge"
 
-msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
+msgid "reorder patch series and apply only the patch"
+msgstr ""
+
+#, fuzzy
+msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]"
 msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOME] [PATCH | INDICE]"
 
 msgid "refresh only files already in the patch and specified files"
@@ -4083,7 +4167,7 @@
 msgstr "elenca tutte le guardie nel file series"
 
 msgid "pop to before first guarded applied patch"
-msgstr "disapplica fino alla prima patch con guardia applicata"
+msgstr "disapplica fino alla prima patch applicata con guardia"
 
 msgid "pop, then reapply patches"
 msgstr "disapplica e poi riapplica le patch"
@@ -4097,35 +4181,48 @@
 msgid "hg qseries [-ms]"
 msgstr "hg qseries [-ms]"
 
-msgid "force removal with local changes"
-msgstr "forza la rimozione con modifiche locali"
+msgid ""
+"force removal of changesets even if the working directory has uncommitted "
+"changes"
+msgstr ""
 
-msgid "bundle unrelated changesets"
+msgid ""
+"bundle only changesets with local revision number greater than REV which are "
+"not descendants of REV (DEPRECATED)"
 msgstr ""
 
 msgid "no backups"
 msgstr "nessun backup"
 
-msgid "hg strip [-f] [-b] [-n] REV"
-msgstr "hg strip [-f] [-b] [-n] REV"
+msgid "hg strip [-f] [-n] REV"
+msgstr ""
 
 msgid "hg qtop [-s]"
-msgstr "hg qtop [-s]"
+msgstr ""
 
-#, fuzzy
 msgid "show only the first patch"
-msgstr "mostra solo i file aggiunti"
+msgstr "mostra solo la prima patch"
 
-#, fuzzy
 msgid "hg qunapplied [-1] [-s] [PATCH]"
-msgstr "hg qunapplied [-s] [PATCH]"
+msgstr ""
 
 msgid "finish all applied changesets"
 msgstr "finalizza tutti i changeset applicati"
 
-#, fuzzy
 msgid "hg qfinish [-a] [REV]..."
-msgstr "hg qfinish [-a] [REV...]"
+msgstr ""
+
+msgid "list all available queues"
+msgstr ""
+
+msgid "create new queue"
+msgstr "crea nuova coda"
+
+msgid "delete reference to queue"
+msgstr ""
+
+msgid "[OPTION] [QUEUE]"
+msgstr "[OPZIONE] [CODA]"
 
 msgid "hooks for sending email notifications at commit/push time"
 msgstr ""
@@ -4178,7 +4275,8 @@
 "  maxdiff = 300          # max lines of diffs to include (0=none, -1=all)\n"
 "  maxsubject = 67        # truncate subject line longer than this\n"
 "  diffstat = True        # add a diffstat before the diff content\n"
-"  sources = serve        # notify if source of incoming changes in this list\n"
+"  sources = serve        # notify if source of incoming changes in this "
+"list\n"
 "                         # (serve == ssh or http, push, pull, bundle)\n"
 "  merge = False          # send notification for merges (default True)\n"
 "  [email]\n"
@@ -4193,9 +4291,6 @@
 "handier for you."
 msgstr ""
 
-msgid "::"
-msgstr ""
-
 msgid ""
 "  [usersubs]\n"
 "  # key is subscriber email, value is \",\"-separated list of glob patterns\n"
@@ -4282,20 +4377,25 @@
 
 msgid ""
 "You can also enable the pager only for certain commands using\n"
-"pager.attend::"
+"pager.attend. Below is the default list of commands to be paged::"
 msgstr ""
 
 msgid ""
 "  [pager]\n"
-"  attend = log"
+"  attend = annotate, cat, diff, export, glog, log, qdiff"
+msgstr ""
+
+msgid ""
+"Setting pager.attend to an empty value will cause all commands to be\n"
+"paged."
 msgstr ""
 
 msgid "If pager.attend is present, pager.ignore will be ignored."
 msgstr ""
 
 msgid ""
-"To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
-"specify them in the global .hgrc\n"
+"To ignore global commands like :hg:`version` or :hg:`help`, you have\n"
+"to specify them in the global .hgrc\n"
 msgstr ""
 
 msgid "interpret suffixes to refer to ancestor revisions"
@@ -4341,7 +4441,7 @@
 msgid ""
 "- The changeset description.\n"
 "- [Optional] The result of running diffstat on the patch.\n"
-"- The patch itself, as generated by \"hg export\"."
+"- The patch itself, as generated by :hg:`export`."
 msgstr ""
 
 msgid ""
@@ -4366,17 +4466,23 @@
 "  from = My Name \n"
 "  to = recipient1, recipient2, ...\n"
 "  cc = cc1, cc2, ...\n"
-"  bcc = bcc1, bcc2, ..."
+"  bcc = bcc1, bcc2, ...\n"
+"  reply-to = address1, address2, ..."
 msgstr ""
 
 msgid ""
-"Then you can use the \"hg email\" command to mail a series of changesets\n"
-"as a patchbomb."
+"Use ``[patchbomb]`` as configuration section name if you need to\n"
+"override global ``[email]`` address settings."
+msgstr ""
+
+msgid ""
+"Then you can use the :hg:`email` command to mail a series of\n"
+"changesets as a patchbomb."
 msgstr ""
 
 msgid ""
 "To avoid sending patches prematurely, it is a good idea to first run\n"
-"the \"email\" command with the \"-n\" option (test only). You will be\n"
+"the :hg:`email` command with the \"-n\" option (test only). You will be\n"
 "prompted for an email recipient address, a subject and an introductory\n"
 "message describing the patches of your patchbomb. Then when all is\n"
 "done, patchbomb messages are displayed. If the PAGER environment\n"
@@ -4415,26 +4521,26 @@
 "hgrc(5) for details.\n"
 msgstr ""
 
-#, fuzzy, python-format
-msgid "%sPlease enter a valid value"
-msgstr "Si prega di inserire un valore valido.\n"
+#, python-format
+msgid "%s Please enter a valid value"
+msgstr "%s Si prega di inserire un valore valido"
 
 msgid "Please enter a valid value.\n"
 msgstr "Si prega di inserire un valore valido.\n"
 
-msgid "does the diffstat above look okay? "
+msgid "does the diffstat above look okay?"
 msgstr "il diffstat di sopra sembra corretto? "
 
 msgid "diffstat rejected"
 msgstr "diffstat rifiutato"
 
 msgid "send changesets by email"
-msgstr ""
+msgstr "invia dei changeset via email"
 
 msgid ""
-"    By default, diffs are sent in the format generated by hg export,\n"
-"    one per message. The series starts with a \"[PATCH 0 of N]\"\n"
-"    introduction, which describes the series as a whole."
+"    By default, diffs are sent in the format generated by\n"
+"    :hg:`export`, one per message. The series starts with a \"[PATCH 0\n"
+"    of N]\" introduction, which describes the series as a whole."
 msgstr ""
 
 msgid ""
@@ -4444,7 +4550,7 @@
 "    description. Next, (optionally) if the diffstat program is\n"
 "    installed and -d/--diffstat is used, the result of running\n"
 "    diffstat on the patch. Finally, the patch itself, as generated by\n"
-"    \"hg export\"."
+"    :hg:`export`."
 msgstr ""
 
 msgid ""
@@ -4483,7 +4589,8 @@
 msgid ""
 "      hg email -b               # send bundle of all patches not in default\n"
 "      hg email -b DEST          # send bundle of all patches not in DEST\n"
-"      hg email -b -r 3000       # bundle of all ancestors of 3000 not in default\n"
+"      hg email -b -r 3000       # bundle of all ancestors of 3000 not in "
+"default\n"
 "      hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in DEST"
 msgstr ""
 
@@ -4558,6 +4665,9 @@
 msgid "write messages to mbox file instead of sending them"
 msgstr "scrive i messaggi nel file mbox invece di inviarli"
 
+msgid "email addresses replies should be sent to"
+msgstr "indirizzi mail cui vanno indirizzate le risposte"
+
 msgid "subject of first message (intro or single patch)"
 msgstr "soggetto del primo messaggio (introduzione o patch singola)"
 
@@ -4579,26 +4689,58 @@
 msgid "send changes not in target as a binary bundle"
 msgstr "invia le modifiche non in target come bundle binario"
 
-#, fuzzy
 msgid "name of the bundle attachment file"
-msgstr "nome del file dell'allegato bundle"
+msgstr "nome file del bundle allegato"
 
 msgid "a revision to send"
 msgstr "una revisione da inviare"
 
-#, fuzzy
 msgid "run even when remote repository is unrelated (with -b/--bundle)"
-msgstr "esegui anche quando il repository remoto non è collegato (con -b)"
+msgstr ""
+"esegui anche quando il repository remoto non è collegato (con -b/--bundle)"
 
-#, fuzzy
 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
-msgstr "un changeset base da specificare invece di una destinazione (con -b)"
+msgstr ""
+"un changeset base da specificare invece di una destinazione (con -b/--bundle)"
 
 msgid "send an introduction email for a single patch"
 msgstr "invia una mail introduttiva per una patch singola"
 
 msgid "hg email [OPTION]... [DEST]..."
-msgstr "hg email [OPZIONI]... [DEST]..."
+msgstr "hg email [OPZIONE]... [DEST]..."
+
+msgid "show progress bars for some actions"
+msgstr ""
+
+msgid ""
+"This extension uses the progress information logged by hg commands\n"
+"to draw progress bars that are as informative as possible. Some progress\n"
+"bars only offer indeterminate information, while others have a definite\n"
+"end point."
+msgstr ""
+
+msgid "The following settings are available::"
+msgstr ""
+
+msgid ""
+"  [progress]\n"
+"  delay = 3 # number of seconds (float) before showing the progress bar\n"
+"  refresh = 0.1 # time in seconds between refreshes of the progress bar\n"
+"  format = topic bar number # format of the progress bar\n"
+"  width =  # if set, the maximum width of the progress information\n"
+"                 # (that is, min(width, term width) will be used)\n"
+"  clear-complete = True # clear the progress bar after it's done\n"
+"  disable = False # if true, don't show a progress bar\n"
+"  assume-tty = False # if true, ALWAYS show a progress bar, unless\n"
+"                     # disable is given"
+msgstr ""
+
+msgid ""
+"Valid entries for the format field are topic, bar, number, unit, and\n"
+"item. item defaults to the last 20 characters of the item, but this\n"
+"can be changed by adding either ``-`` which would take the last\n"
+"num characters, or ``+`` for the first num characters.\n"
+msgstr ""
 
 #, fuzzy
 msgid "command to delete untracked files from the working directory"
@@ -4616,7 +4758,7 @@
 msgstr ""
 
 msgid ""
-"    - Unknown files: files marked with \"?\" by \"hg status\"\n"
+"    - Unknown files: files marked with \"?\" by :hg:`status`\n"
 "    - Empty directories: in fact Mercurial ignores directories unless\n"
 "      they contain files under source control management"
 msgstr ""
@@ -4627,7 +4769,7 @@
 msgid ""
 "    - Modified and unmodified tracked files\n"
 "    - Ignored files (unless --all is specified)\n"
-"    - New files added to the repository (with \"hg add\")"
+"    - New files added to the repository (with :hg:`add`)"
 msgstr ""
 
 msgid ""
@@ -4674,7 +4816,7 @@
 msgstr "termina il nome dei file con NUL, per usarli con xargs (implica -p)"
 
 msgid "hg purge [OPTION]... [DIR]..."
-msgstr "hg purge [OPZIONI]... [DIR]..."
+msgstr "hg purge [OPZIONE]... [DIR]..."
 
 #, fuzzy
 msgid "command to move sets of revisions to a different ancestor"
@@ -4703,46 +4845,117 @@
 #, fuzzy
 msgid ""
 "    Rebase uses repeated merging to graft changesets from one part of\n"
-"    history onto another. This can be useful for linearizing local\n"
-"    changes relative to a master development tree."
+"    history (the source) onto another (the destination). This can be\n"
+"    useful for linearizing *local* changes relative to a master\n"
+"    development tree."
 msgstr ""
 "    Rebase usa merge ripetuti per trapiantare changeset da una parte\n"
 "    della storia in un'altra. Questo può essere utile per linearizzare\n"
 "    modifiche locali relative ad un albero di sviluppo principale."
 
+msgid ""
+"    You should not rebase changesets that have already been shared\n"
+"    with others. Doing so will force everybody else to perform the\n"
+"    same rebase or they will end up with duplicated changesets after\n"
+"    pulling in your rebased changesets."
+msgstr ""
+
+msgid ""
+"    If you don't specify a destination changeset (``-d/--dest``),\n"
+"    rebase uses the tipmost head of the current named branch as the\n"
+"    destination. (The destination changeset is not modified by\n"
+"    rebasing, but new changesets are added as its descendants.)"
+msgstr ""
+
+msgid ""
+"    You can specify which changesets to rebase in two ways: as a\n"
+"    \"source\" changeset or as a \"base\" changeset. Both are shorthand\n"
+"    for a topologically related set of changesets (the \"source\n"
+"    branch\"). If you specify source (``-s/--source``), rebase will\n"
+"    rebase that changeset and all of its descendants onto dest. If you\n"
+"    specify base (``-b/--base``), rebase will select ancestors of base\n"
+"    back to but not including the common ancestor with dest. Thus,\n"
+"    ``-b`` is less precise but more convenient than ``-s``: you can\n"
+"    specify any changeset in the source branch, and rebase will select\n"
+"    the whole branch. If you specify neither ``-s`` nor ``-b``, rebase\n"
+"    uses the parent of the working directory as the base."
+msgstr ""
+
+msgid ""
+"    By default, rebase recreates the changesets in the source branch\n"
+"    as descendants of dest and then destroys the originals. Use\n"
+"    ``--keep`` to preserve the original source changesets. Some\n"
+"    changesets in the source branch (e.g. merges from the destination\n"
+"    branch) may be dropped if they no longer contribute any change."
+msgstr ""
+
+msgid ""
+"    One result of the rules for selecting the destination changeset\n"
+"    and source branch is that, unlike ``merge``, rebase will do\n"
+"    nothing if you are at the latest (tipmost) head of a named branch\n"
+"    with two heads. You need to explicitly specify source and/or\n"
+"    destination (or ``update`` to the other head, if it's the head of\n"
+"    the intended source branch)."
+msgstr ""
+
 #, fuzzy
 msgid ""
 "    If a rebase is interrupted to manually resolve a merge, it can be\n"
-"    continued with --continue/-c or aborted with --abort/-a.\n"
-"    "
+"    continued with --continue/-c or aborted with --abort/-a."
 msgstr ""
 "    Se un rebase viene interrotto per risolvere manualmente un merge,\n"
 "    può essere ripreso con --continue o abortito con --abort.\n"
 "    "
 
+msgid ""
+"    Returns 0 on success, 1 if nothing to rebase.\n"
+"    "
+msgstr ""
+
 msgid "cannot use both abort and continue"
 msgstr "non è possibile usare sia abort sia continue"
 
 msgid "cannot use collapse with continue or abort"
 msgstr "non è possibile usare collapse con continue o abort"
 
+#, fuzzy
+msgid "cannot use detach with continue or abort"
+msgstr "non è possibile usare collapse con continue o abort"
+
 msgid "abort and continue do not allow specifying revisions"
 msgstr "abort e continue non consentono di specificare revisioni"
 
 msgid "cannot specify both a revision and a base"
 msgstr "non è possibile specificare sia una revisione sia una base"
 
+msgid "detach requires a revision to be specified"
+msgstr ""
+
+#, fuzzy
+msgid "cannot specify a base with detach"
+msgstr "impossibile specificare sia --rev sia --change"
+
 msgid "nothing to rebase\n"
 msgstr "niente di cui effettuare il rebase\n"
 
 msgid "cannot use both keepbranches and extrafn"
 msgstr "non è possibile usare sia keepbranches sia extrafn"
 
+msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
+msgstr ""
+"correggi i conflitti non risolti con hg resolve e poi esegui hg rebase --"
+"continue"
+
+#, python-format
+msgid "no changes, revision %d skipped\n"
+msgstr "nessuna modifica, revisione %d saltata\n"
+
 msgid "rebase merging completed\n"
 msgstr "merge del rebase completato\n"
 
 msgid "warning: new changesets detected on source branch, not stripping\n"
-msgstr "attenzione: nuovi changeset rilevati sulla branch sorgente, non li rimuovo\n"
+msgstr ""
+"attenzione: nuovi changeset rilevati sulla branch sorgente, non li rimuovo\n"
 
 msgid "rebase completed\n"
 msgstr "rebase completato\n"
@@ -4751,22 +4964,22 @@
 msgid "%d revisions have been skipped\n"
 msgstr "%d revisioni sono state saltate\n"
 
-msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
-msgstr "correggi i conflitti non risolti con hg resolve e poi esegui hg rebase --continue"
-
-#, python-format
-msgid "no changes, revision %d skipped\n"
-msgstr "nessuna modifica, revisione %d saltata\n"
+msgid "unable to collapse, there is more than one external parent"
+msgstr "impossibile effettuare il collapse, c'è più di un genitore esterno"
 
 #, python-format
 msgid "cannot use revision %d as base, result would have 3 parents"
-msgstr "non è possibile usare la revisione %d come base, il risultato avrebbe 3 genitori"
+msgstr ""
+"non è possibile usare la revisione %d come base, il risultato avrebbe 3 "
+"genitori"
 
 msgid "no rebase in progress"
 msgstr "nessun rebase in corso"
 
-msgid "warning: new changesets detected on target branch, not stripping\n"
-msgstr "attenzione: nuovi changeset rilevati sulla branch target, non li rimuovo\n"
+#, fuzzy
+msgid "warning: new changesets detected on target branch, can't abort\n"
+msgstr ""
+"attenzione: nuovi changeset rilevati sulla branch target, non li rimuovo\n"
 
 msgid "rebase aborted\n"
 msgstr "rebase abortito\n"
@@ -4781,20 +4994,21 @@
 msgid "source is descendant of destination"
 msgstr ""
 
-msgid "unable to collapse, there is more than one external parent"
-msgstr "impossibile effettuare il collapse, c'è più di un genitore esterno"
-
 msgid "rebase working directory to branch head"
 msgstr "effettua il rebase della directory di lavoro sulla head della branch"
 
-msgid "rebase from a given revision"
-msgstr "rebase da una data revisione"
+#, fuzzy
+msgid "rebase from the specified changeset"
+msgstr "mostra i genitori della revisione specificata"
 
-msgid "rebase from the base of a given revision"
-msgstr "rebase dalla base di una data revisione"
+msgid ""
+"rebase from the base of the specified changeset (up to greatest common "
+"ancestor of base and dest)"
+msgstr ""
 
-msgid "rebase onto a given revision"
-msgstr "rebase su una data revisione"
+#, fuzzy
+msgid "rebase onto the specified changeset"
+msgstr "rev %d punta al changeset inatteso %d"
 
 #, fuzzy
 msgid "collapse the rebased changesets"
@@ -4808,6 +5022,9 @@
 msgid "keep original branch names"
 msgstr "mantiene le branch originali"
 
+msgid "force detaching of source from its original branch"
+msgstr ""
+
 msgid "continue an interrupted rebase"
 msgstr "continua un rebase interrotto"
 
@@ -4815,8 +5032,11 @@
 msgstr "abortisce un rebase interrotto"
 
 #, fuzzy
-msgid "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]"
-msgstr "hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]"
+msgid ""
+"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
+"hg rebase {-a|-c}"
+msgstr ""
+"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]"
 
 #, fuzzy
 msgid "commands to interactively select changes for commit/qrefresh"
@@ -4864,9 +5084,6 @@
 msgid "&?"
 msgstr "?"
 
-msgid "y - record this change"
-msgstr "y - registra questa modifica"
-
 msgid "user quit"
 msgstr ""
 
@@ -4877,9 +5094,6 @@
 msgid " and "
 msgstr " e "
 
-msgid "y"
-msgstr "y"
-
 #, python-format
 msgid "record this change to %r?"
 msgstr "registrare questa modifica a %r?"
@@ -4894,7 +5108,7 @@
 
 #, fuzzy
 msgid ""
-"    If a list of files is omitted, all changes reported by \"hg status\"\n"
+"    If a list of files is omitted, all changes reported by :hg:`status`\n"
 "    will be candidates for recording."
 msgstr ""
 "    Se viene omesso un elenco di file, tutte le modifiche\n"
@@ -4902,7 +5116,7 @@
 "    registrazione."
 
 #, fuzzy
-msgid "    See 'hg help dates' for a list of formats valid for -d/--date."
+msgid "    See :hg:`help dates` for a list of formats valid for -d/--date."
 msgstr ""
 "    Vedere 'hg help dates' per un elenco di formati\n"
 "    validi per -d/--date."
@@ -4949,12 +5163,18 @@
 msgid "      ? - display help"
 msgstr "    ? - mostra il messaggio di aiuto"
 
+msgid "    This command is not available when committing a merge."
+msgstr ""
+
 msgid "'mq' extension not loaded"
 msgstr "estensione 'mq' non caricata"
 
 msgid "running non-interactively, use commit instead"
 msgstr ""
 
+msgid "cannot partially commit a merge (use hg commit instead)"
+msgstr ""
+
 msgid "no changes to record\n"
 msgstr "nessuna modifica da registrare\n"
 
@@ -4962,54 +5182,210 @@
 msgstr ""
 
 msgid "hg record [OPTION]... [FILE]..."
-msgstr "hg record [OPZIONI]... [FILE]..."
+msgstr "hg record [OPZIONE]... [FILE]..."
 
 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
-msgstr "hg qrecord [OPZIONI]... PATCH [FILE]..."
+msgstr "hg qrecord [OPZIONE]... PATCH [FILE]..."
 
-msgid "share a common history between several working directories"
+msgid "recreates hardlinks between repository clones"
 msgstr ""
 
-msgid "create a new shared repository (experimental)"
+msgid "recreate hardlinks between two repositories"
 msgstr ""
 
 msgid ""
-"    Initialize a new repository and working directory that shares its\n"
-"    history with another repository."
+"    When repositories are cloned locally, their data files will be\n"
+"    hardlinked so that they only use the space of a single repository."
 msgstr ""
 
 msgid ""
-"    NOTE: actions that change history such as rollback or moving the\n"
-"    source may confuse sharers.\n"
-"    "
+"    Unfortunately, subsequent pulls into either repository will break\n"
+"    hardlinks for any files touched by the new changesets, even if\n"
+"    both repositories end up pulling the same changes."
 msgstr ""
 
-#, fuzzy
-msgid "do not create a working copy"
-msgstr "non aggiornare le nuove directory di lavoro"
-
-#, fuzzy
-msgid "[-U] SOURCE [DEST]"
-msgstr "[OPZIONI]... SORGENTE [DEST]"
-
-msgid "command to transplant changesets from another branch"
+msgid ""
+"    Similarly, passing --rev to \"hg clone\" will fail to use any\n"
+"    hardlinks, falling back to a complete copy of the source\n"
+"    repository."
 msgstr ""
 
-msgid "This extension allows you to transplant patches from another branch."
+msgid ""
+"    This command lets you recreate those hardlinks and reclaim that\n"
+"    wasted space."
 msgstr ""
 
 msgid ""
-"Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
-"map from a changeset hash to its hash in the source repository.\n"
+"    This repository will be relinked to share space with ORIGIN, which\n"
+"    must be on the same local disk. If ORIGIN is omitted, looks for\n"
+"    \"default-relink\", then \"default\", in [paths]."
 msgstr ""
 
-#, python-format
-msgid "skipping already applied revision %s\n"
+msgid ""
+"    Do not attempt any read operations on this repository while the\n"
+"    command is running. (Both repositories will be locked against\n"
+"    writes.)\n"
+"    "
 msgstr ""
 
-#, python-format
-msgid "skipping merge changeset %s:%s\n"
-msgstr ""
+#, fuzzy
+msgid "hardlinks are not supported on this system"
+msgstr "Hardlink non supportati"
+
+#, fuzzy, python-format
+msgid "relinking %s to %s\n"
+msgstr "sto ottenendo %s in %s\n"
+
+#, python-format
+msgid "tip has %d files, estimated total number of files: %s\n"
+msgstr ""
+
+#, fuzzy
+msgid "collecting"
+msgstr "sto collezionando gli rlog CVS\n"
+
+#, fuzzy
+msgid "files"
+msgstr "file:"
+
+#, python-format
+msgid "collected %d candidate storage files\n"
+msgstr ""
+
+#, fuzzy
+msgid "source and destination are on different devices"
+msgstr "nessuna sorgente o destinazione specificata"
+
+#, fuzzy, python-format
+msgid "not linkable: %s\n"
+msgstr "non nel dirstate: %s\n"
+
+#, fuzzy
+msgid " files"
+msgstr "file:"
+
+#, fuzzy
+msgid "pruning"
+msgstr "sto eseguendo %s\n"
+
+#, python-format
+msgid "pruned down to %d probably relinkable files\n"
+msgstr ""
+
+msgid "relinking"
+msgstr ""
+
+#, python-format
+msgid "relinked %d files (%d bytes reclaimed)\n"
+msgstr ""
+
+msgid "[ORIGIN]"
+msgstr ""
+
+msgid "extend schemes with shortcuts to repository swarms"
+msgstr ""
+
+msgid ""
+"This extension allows you to specify shortcuts for parent URLs with a\n"
+"lot of repositories to act like a scheme, for example::"
+msgstr ""
+
+msgid ""
+"  [schemes]\n"
+"  py = http://code.python.org/hg/"
+msgstr ""
+
+msgid "After that you can use it like::"
+msgstr ""
+
+msgid "  hg clone py://trunk/"
+msgstr ""
+
+msgid ""
+"Additionally there is support for some more complex schemas, for\n"
+"example used by Google Code::"
+msgstr ""
+
+msgid ""
+"  [schemes]\n"
+"  gcode = http://{1}.googlecode.com/hg/"
+msgstr ""
+
+msgid ""
+"The syntax is taken from Mercurial templates, and you have unlimited\n"
+"number of variables, starting with ``{1}`` and continuing with\n"
+"``{2}``, ``{3}`` and so on. This variables will receive parts of URL\n"
+"supplied, split by ``/``. Anything not specified as ``{part}`` will be\n"
+"just appended to an URL."
+msgstr ""
+
+msgid "For convenience, the extension adds these schemes by default::"
+msgstr ""
+
+msgid ""
+"  [schemes]\n"
+"  py = http://hg.python.org/\n"
+"  bb = https://bitbucket.org/\n"
+"  bb+ssh = ssh://hg@bitbucket.org/\n"
+"  gcode = https://{1}.googlecode.com/hg/\n"
+"  kiln = https://{1}.kilnhg.com/Repo/"
+msgstr ""
+
+msgid ""
+"You can override a predefined scheme by defining a new scheme with the\n"
+"same name.\n"
+msgstr ""
+
+msgid "share a common history between several working directories"
+msgstr ""
+
+#, fuzzy
+msgid "create a new shared repository"
+msgstr "crea il repository della coda"
+
+msgid ""
+"    Initialize a new repository and working directory that shares its\n"
+"    history with another repository."
+msgstr ""
+
+msgid ""
+"    NOTE: using rollback or extensions that destroy/modify history\n"
+"    (mq, rebase, etc.) can cause considerable confusion with shared\n"
+"    clones. In particular, if two shared clones are both updated to\n"
+"    the same changeset, and one of them destroys that changeset with\n"
+"    rollback, the other clone will suddenly stop working: all\n"
+"    operations will fail with \"abort: working directory has unknown\n"
+"    parent\". The only known workaround is to use debugsetparents on\n"
+"    the broken clone to reset it to a changeset that still exists\n"
+"    (e.g. tip).\n"
+"    "
+msgstr ""
+
+#, fuzzy
+msgid "do not create a working copy"
+msgstr "non aggiornare le nuove directory di lavoro"
+
+msgid "[-U] SOURCE [DEST]"
+msgstr "[-U] SORGENTE [DEST]"
+
+msgid "command to transplant changesets from another branch"
+msgstr ""
+
+msgid "This extension allows you to transplant patches from another branch."
+msgstr ""
+
+msgid ""
+"Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
+"map from a changeset hash to its hash in the source repository.\n"
+msgstr ""
+
+#, python-format
+msgid "skipping already applied revision %s\n"
+msgstr ""
+
+#, python-format
+msgid "skipping merge changeset %s:%s\n"
+msgstr ""
 
 #, python-format
 msgid "%s merged at %s\n"
@@ -5050,9 +5426,22 @@
 msgid "commit failed"
 msgstr "commit fallito"
 
+msgid ""
+"y: transplant this changeset\n"
+"n: skip this changeset\n"
+"m: merge at this changeset\n"
+"p: show patch\n"
+"c: commit selected changesets\n"
+"q: cancel transplant\n"
+"?: show this help\n"
+msgstr ""
+
 msgid "apply changeset? [ynmpcq?]:"
 msgstr "applicare il changeset? [ynmpcq?]:"
 
+msgid "no such option\n"
+msgstr ""
+
 msgid "transplant changesets from another branch"
 msgstr ""
 
@@ -5081,7 +5470,7 @@
 msgstr ""
 
 msgid ""
-"    hg transplant --branch REVISION --all will rebase the selected\n"
+"    :hg:`transplant --branch REVISION --all` will rebase the selected\n"
 "    branch (up to the named revision) onto your current working\n"
 "    directory."
 msgstr ""
@@ -5094,14 +5483,14 @@
 msgstr ""
 
 msgid ""
-"    If no merges or revisions are provided, hg transplant will start\n"
-"    an interactive changeset browser."
+"    If no merges or revisions are provided, :hg:`transplant` will\n"
+"    start an interactive changeset browser."
 msgstr ""
 
 msgid ""
 "    If a changeset application fails, you can fix the merge by hand\n"
-"    and then resume where you left off by calling hg transplant\n"
-"    --continue/-c.\n"
+"    and then resume where you left off by calling :hg:`transplant\n"
+"    --continue/-c`.\n"
 "    "
 msgstr ""
 
@@ -5126,7 +5515,10 @@
 msgid "outstanding local changes"
 msgstr ""
 
-msgid "pull patches from REPOSITORY"
+msgid "pull patches from REPO"
+msgstr ""
+
+msgid "BRANCH"
 msgstr ""
 
 msgid "pull patches from branch BRANCH"
@@ -5147,10 +5539,11 @@
 msgid "continue last transplant session after repair"
 msgstr ""
 
-msgid "filter changesets through FILTER"
-msgstr ""
+#, fuzzy
+msgid "filter changesets through command"
+msgstr "%d changeset trovati\n"
 
-msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
+msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
 msgstr ""
 
 msgid "allow the use of MBCS paths with problematic encodings"
@@ -5186,16 +5579,21 @@
 msgid "Note that there are some limitations on using this extension:"
 msgstr ""
 
+msgid "- You should use single encoding in one repository."
+msgstr ""
+
 msgid ""
-"- You should use single encoding in one repository.\n"
-"- You should set same encoding for the repository by locale or\n"
-"  HGENCODING."
+"\n"
+"By default, win32mbcs uses encoding.encoding decided by Mercurial.\n"
+"You can specify the encoding by config option::"
 msgstr ""
 
 msgid ""
-"Path encoding conversion are done between Unicode and\n"
-"encoding.encoding which is decided by Mercurial from current locale\n"
-"setting or HGENCODING.\n"
+" [win32mbcs]\n"
+" encoding = sjis"
+msgstr ""
+
+msgid "It is useful for the users who want to commit with UTF-8 log message.\n"
 msgstr ""
 
 #, python-format
@@ -5208,6 +5606,18 @@
 msgid "perform automatic newline conversion"
 msgstr ""
 
+msgid ""
+"  Deprecation: The win32text extension requires each user to configure\n"
+"  the extension again and again for each clone since the configuration\n"
+"  is not copied when cloning."
+msgstr ""
+
+msgid ""
+"  We have therefore made the ``eol`` as an alternative. The ``eol``\n"
+"  uses a version controlled file for its configuration and each clone\n"
+"  will therefore use the right settings from the start."
+msgstr ""
+
 msgid "To perform automatic newline conversion, use::"
 msgstr ""
 
@@ -5225,7 +5635,8 @@
 "  # or ** = macdecode:"
 msgstr ""
 
-msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::"
+msgid ""
+"If not doing conversion, to make sure you do not commit CRLF/CR by accident::"
 msgstr ""
 
 msgid ""
@@ -5292,14 +5703,14 @@
 msgstr ""
 
 msgid ""
-"Zeroconf enabled repositories will be announced in a network without\n"
+"Zeroconf-enabled repositories will be announced in a network without\n"
 "the need to configure a server or a service. They can be discovered\n"
 "without knowing their actual IP address."
 msgstr ""
 
 msgid ""
-"To allow other people to discover your repository using run \"hg serve\"\n"
-"in your repository::"
+"To allow other people to discover your repository using run\n"
+":hg:`serve` in your repository::"
 msgstr ""
 
 msgid ""
@@ -5307,7 +5718,9 @@
 "  $ hg serve"
 msgstr ""
 
-msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::"
+msgid ""
+"You can discover Zeroconf-enabled repositories by running\n"
+":hg:`paths`::"
 msgstr ""
 
 msgid ""
@@ -5362,6 +5775,10 @@
 msgid "username %s contains a newline"
 msgstr ""
 
+#, python-format
+msgid "the name '%s' is reserved"
+msgstr "il nome '%s' è riservato"
+
 msgid "options --message and --logfile are mutually exclusive"
 msgstr ""
 
@@ -5410,6 +5827,14 @@
 msgid "%s: not overwriting - file exists\n"
 msgstr ""
 
+#, fuzzy, python-format
+msgid "%s: not recording move - %s does not exist\n"
+msgstr "il nodo %s:%d non esiste\n"
+
+#, fuzzy, python-format
+msgid "%s: not recording copy - %s does not exist\n"
+msgstr "il nodo %s:%d non esiste\n"
+
 #, python-format
 msgid "%s: deleted in working copy\n"
 msgstr ""
@@ -5437,7 +5862,8 @@
 msgstr "nessuna destinazione specificata"
 
 msgid "with multiple sources, destination must be an existing directory"
-msgstr "con sorgenti multiple la destinazione deve essere una directory esistente"
+msgstr ""
+"con sorgenti multiple la destinazione deve essere una directory esistente"
 
 #, python-format
 msgid "destination %s is not a directory"
@@ -5449,6 +5875,9 @@
 msgid "(consider using --after)\n"
 msgstr "(considera di usare --after)\n"
 
+msgid "child process failed to start"
+msgstr ""
+
 #, python-format
 msgid "changeset:   %d:%s\n"
 msgstr "changeset:   %d:%s\n"
@@ -5510,10 +5939,6 @@
 msgstr "%s: nessuna chiave chiamata '%s'"
 
 #, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#, python-format
 msgid "Found revision %s from %s\n"
 msgstr "Trovata revisione %s da %s\n"
 
@@ -5524,10 +5949,6 @@
 msgid "cannot follow nonexistent file: \"%s\""
 msgstr "impossibile seguire il file non esistente: \"%s\""
 
-#, python-format
-msgid "%s:%s copy source revision cannot be found!\n"
-msgstr ""
-
 msgid "can only follow copies/renames for explicit filenames"
 msgstr ""
 
@@ -5537,9 +5958,9 @@
 msgid "HG: Leave message empty to abort commit."
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "HG: user: %s"
-msgstr "utente: %s\n"
+msgstr "HG: utente: %s"
 
 msgid "HG: branch merge"
 msgstr ""
@@ -5550,23 +5971,22 @@
 
 #, python-format
 msgid "HG: subrepo %s"
-msgstr ""
+msgstr "HG: subrepository %s"
 
 #, python-format
 msgid "HG: added %s"
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "HG: changed %s"
-msgstr "aggiungo changeset %s\n"
+msgstr "HG: cambiato %s"
 
-#, fuzzy, python-format
+#, python-format
 msgid "HG: removed %s"
-msgstr "rimossi"
+msgstr "HG: rimosso %s"
 
-#, fuzzy
 msgid "HG: no files changed"
-msgstr "sto aggiungendo le modifiche ai file\n"
+msgstr "HG: nessun file modificato"
 
 msgid "empty commit message"
 msgstr "messaggio di commit vuoto"
@@ -5579,13 +5999,39 @@
 "    repository."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "    The files will be added to the repository at the next commit. To\n"
-"    undo an add before that, see hg forget."
+"    undo an add before that, see :hg:`forget`."
+msgstr ""
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
+"    e le aggiunge al repository locale."
+
+msgid "    If no names are given, add all files to the repository."
+msgstr ""
+
+msgid "    .. container:: verbose"
+msgstr ""
+
+msgid ""
+"       An example showing how new (unknown) files are added\n"
+"       automatically by :hg:`add`::"
 msgstr ""
 
 msgid ""
-"    If no names are given, add all files to the repository.\n"
+"         $ ls\n"
+"         foo.c\n"
+"         $ hg status\n"
+"         ? foo.c\n"
+"         $ hg add\n"
+"         adding foo.c\n"
+"         $ hg status\n"
+"         A foo.c"
+msgstr ""
+
+msgid ""
+"    Returns 0 if all files are successfully added.\n"
 "    "
 msgstr ""
 
@@ -5609,8 +6055,8 @@
 "    every added file and records those similar enough as renames. This\n"
 "    option takes a percentage between 0 (disabled) and 100 (files must\n"
 "    be identical) as its parameter. Detecting renamed files this way\n"
-"    can be expensive.\n"
-"    "
+"    can be expensive. After using this option, :hg:`status -C` can be\n"
+"    used to check which files were identified as moved or renamed."
 msgstr ""
 
 msgid "similarity must be a number"
@@ -5636,7 +6082,11 @@
 "    Without the -a/--text option, annotate will avoid processing files\n"
 "    it detects as binary. With -a, annotate will annotate the file\n"
 "    anyway, although the results will probably be neither useful\n"
-"    nor desirable.\n"
+"    nor desirable."
+msgstr ""
+
+msgid ""
+"    Returns 0 on success.\n"
 "    "
 msgstr ""
 
@@ -5659,30 +6109,32 @@
 msgstr ""
 
 msgid ""
-"    To specify the type of archive to create, use -t/--type. Valid\n"
-"    types are::"
+"    The archive type is automatically detected based on file\n"
+"    extension (or override using -t/--type)."
+msgstr ""
+
+msgid "    Valid types are:"
 msgstr ""
 
 msgid ""
-"      \"files\" (default): a directory full of files\n"
-"      \"tar\": tar archive, uncompressed\n"
-"      \"tbz2\": tar archive, compressed using bzip2\n"
-"      \"tgz\": tar archive, compressed using gzip\n"
-"      \"uzip\": zip archive, uncompressed\n"
-"      \"zip\": zip archive, compressed using deflate"
+"    :``files``: a directory full of files (default)\n"
+"    :``tar``:   tar archive, uncompressed\n"
+"    :``tbz2``:  tar archive, compressed using bzip2\n"
+"    :``tgz``:   tar archive, compressed using gzip\n"
+"    :``uzip``:  zip archive, uncompressed\n"
+"    :``zip``:   zip archive, compressed using deflate"
 msgstr ""
 
 msgid ""
 "    The exact name of the destination archive or directory is given\n"
-"    using a format string; see 'hg help export' for details."
+"    using a format string; see :hg:`help export` for details."
 msgstr ""
 
 msgid ""
 "    Each member added to an archive file has a directory prefix\n"
 "    prepended. Use -p/--prefix to specify a format string for the\n"
 "    prefix. The default is the basename of the archive, with suffixes\n"
-"    removed.\n"
-"    "
+"    removed."
 msgstr ""
 
 msgid "no working directory: please specify a revision"
@@ -5791,8 +6243,7 @@
 "    Its exit status will be used to mark revisions as good or bad:\n"
 "    status 0 means good, 125 means to skip the revision, 127\n"
 "    (command not found) will abort the bisection, and any other\n"
-"    non-zero exit status means the revision is bad.\n"
-"    "
+"    non-zero exit status means the revision is bad."
 msgstr ""
 
 #, fuzzy
@@ -5829,9 +6280,9 @@
 msgid "%s killed"
 msgstr "%s ucciso"
 
-#, fuzzy, python-format
+#, python-format
 msgid "Changeset %d:%s: %s\n"
-msgstr "Changeset %s: %s\n"
+msgstr "Changeset %d:%s: %s\n"
 
 #, python-format
 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
@@ -5860,17 +6311,19 @@
 msgstr ""
 
 msgid ""
-"    Use the command 'hg update' to switch to an existing branch. Use\n"
-"    'hg commit --close-branch' to mark this branch as closed.\n"
-"    "
+"    Use the command :hg:`update` to switch to an existing branch. Use\n"
+"    :hg:`commit --close-branch` to mark this branch as closed."
 msgstr ""
 
 #, python-format
 msgid "reset working directory to branch %s\n"
 msgstr "resetto la directory di lavoro alla branch %s\n"
 
-msgid "a branch of the same name already exists (use --force to override)"
-msgstr "una branch con lo stesso nome esiste già (usare --force per sovrascrivere)"
+msgid ""
+"a branch of the same name already exists (use 'hg update' to switch to it)"
+msgstr ""
+"una branch con lo stesso nome esiste già (usare 'hg update' per passare ad "
+"essa)"
 
 #, python-format
 msgid "marked working directory as branch %s\n"
@@ -5882,7 +6335,7 @@
 msgid ""
 "    List the repository's named branches, indicating which ones are\n"
 "    inactive. If -c/--closed is specified, also list branches which have\n"
-"    been marked closed (see hg commit --close-branch)."
+"    been marked closed (see :hg:`commit --close-branch`)."
 msgstr ""
 
 msgid ""
@@ -5890,11 +6343,20 @@
 "    is considered active if it contains repository heads."
 msgstr ""
 
+msgid "    Use the command :hg:`update` to switch to an existing branch."
+msgstr ""
+
 msgid ""
-"    Use the command 'hg update' to switch to an existing branch.\n"
+"    Returns 0.\n"
 "    "
 msgstr ""
 
+msgid " (closed)"
+msgstr ""
+
+msgid " (inactive)"
+msgstr ""
+
 msgid "create a changegroup file"
 msgstr ""
 
@@ -5904,8 +6366,8 @@
 msgstr ""
 
 msgid ""
-"    If no destination repository is specified the destination is\n"
-"    assumed to have all the nodes specified by one or more --base\n"
+"    If you omit the destination repository, then hg assumes the\n"
+"    destination will have all the nodes you specify with --base\n"
 "    parameters. To create a bundle containing all changesets, use\n"
 "    -a/--all (or --base null)."
 msgstr ""
@@ -5925,7 +6387,11 @@
 
 msgid ""
 "    Applying bundles preserves all changeset contents including\n"
-"    permissions, copy/rename information, and revision history.\n"
+"    permissions, copy/rename information, and revision history."
+msgstr ""
+
+msgid ""
+"    Returns 0 on success, 1 if no changes found.\n"
 "    "
 msgstr ""
 
@@ -5948,14 +6414,13 @@
 msgid ""
 "    Output may be to a file, in which case the name of the file is\n"
 "    given using a format string. The formatting rules are the same as\n"
-"    for the export command, with the following additions::"
+"    for the export command, with the following additions:"
 msgstr ""
 
 msgid ""
-"      %s   basename of file being printed\n"
-"      %d   dirname of file being printed, or '.' if in repository root\n"
-"      %p   root-relative path name of file being printed\n"
-"    "
+"    :``%s``: basename of file being printed\n"
+"    :``%d``: dirname of file being printed, or '.' if in repository root\n"
+"    :``%p``: root-relative path name of file being printed"
 msgstr ""
 
 msgid "make a copy of an existing repository"
@@ -5974,40 +6439,45 @@
 "    .hg/hgrc file, as the default to be used for future pulls."
 msgstr ""
 
-msgid ""
-"    If you use the -r/--rev option to clone up to a specific revision,\n"
-"    no subsequent revisions (including subsequent tags) will be\n"
-"    present in the cloned repository. This option implies --pull, even\n"
-"    on local repositories."
+#, fuzzy
+msgid "    See :hg:`help urls` for valid source format details."
 msgstr ""
+"    Vedere pull per dettagli sui formati di sorgenti validi.\n"
+"    "
 
 msgid ""
-"    By default, clone will check out the head of the 'default' branch.\n"
-"    If the -U/--noupdate option is used, the new clone will contain\n"
-"    only a repository (.hg) and no working copy (the working copy\n"
-"    parent is the null revision)."
+"    It is possible to specify an ``ssh://`` URL as the destination, but no\n"
+"    .hg/hgrc and working directory will be created on the remote side.\n"
+"    Please see :hg:`help urls` for important details about ``ssh://`` URLs."
 msgstr ""
 
-msgid "    See 'hg help urls' for valid source format details."
+msgid ""
+"    A set of changesets (tags, or branch names) to pull may be specified\n"
+"    by listing each changeset (tag, or branch name) with -r/--rev.\n"
+"    If -r/--rev is used, the cloned repository will contain only a subset\n"
+"    of the changesets of the source repository. Only the set of changesets\n"
+"    defined by all -r/--rev options (including all their ancestors)\n"
+"    will be pulled into the destination repository.\n"
+"    No subsequent changesets (including subsequent tags) will be present\n"
+"    in the destination."
 msgstr ""
 
 msgid ""
-"    It is possible to specify an ``ssh://`` URL as the destination, but no\n"
-"    .hg/hgrc and working directory will be created on the remote side.\n"
-"    Please see 'hg help urls' for important details about ``ssh://`` URLs."
+"    Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n"
+"    local source repositories."
 msgstr ""
 
 msgid ""
 "    For efficiency, hardlinks are used for cloning whenever the source\n"
 "    and destination are on the same filesystem (note this applies only\n"
-"    to the repository data, not to the checked out files). Some\n"
+"    to the repository data, not to the working directory). Some\n"
 "    filesystems, such as AFS, implement hardlinking incorrectly, but\n"
 "    do not report errors. In these cases, use the --pull option to\n"
 "    avoid hardlinking."
 msgstr ""
 
 msgid ""
-"    In some cases, you can clone repositories and checked out files\n"
+"    In some cases, you can clone repositories and the working directory\n"
 "    using full hardlinks with ::"
 msgstr ""
 
@@ -6020,24 +6490,46 @@
 "    the operation is up to you) and you have to make sure your editor\n"
 "    breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
 "    this is not compatible with certain extensions that place their\n"
-"    metadata under the .hg directory, such as mq.\n"
-"    "
+"    metadata under the .hg directory, such as mq."
+msgstr ""
+
+msgid ""
+"    Mercurial will update the working directory to the first applicable\n"
+"    revision from this list:"
+msgstr ""
+
+msgid ""
+"    a) null if -U or the source repository has no changesets\n"
+"    b) if -u . and the source repository is local, the first parent of\n"
+"       the source repository's working directory\n"
+"    c) the changeset specified with -u (if a branch name, this means the\n"
+"       latest head of that branch)\n"
+"    d) the changeset specified with -r\n"
+"    e) the tipmost head specified with -b\n"
+"    f) the tipmost head specified with the url#branch source syntax\n"
+"    g) the tipmost head of the default branch\n"
+"    h) tip"
 msgstr ""
 
 #, fuzzy
+msgid "cannot specify both --noupdate and --updaterev"
+msgstr "non è possibile specificare sia una revisione sia una base"
+
+#, fuzzy
 msgid "commit the specified files or all outstanding changes"
-msgstr "effettua il commit dei file specificati o di tutte le modifiche pendenti"
+msgstr ""
+"effettua il commit dei file specificati o di tutte le modifiche pendenti"
 
 #, fuzzy
 msgid ""
 "    Commit changes to the given files into the repository. Unlike a\n"
-"    centralized RCS, this operation is a local operation. See hg push\n"
-"    for a way to actively distribute your changes."
+"    centralized RCS, this operation is a local operation. See\n"
+"    :hg:`push` for a way to actively distribute your changes."
 msgstr "    Effettua il commit delle modifiche sui file dati nel repository."
 
 #, fuzzy
 msgid ""
-"    If a list of files is omitted, all changes reported by \"hg status\"\n"
+"    If a list of files is omitted, all changes reported by :hg:`status`\n"
 "    will be committed."
 msgstr ""
 "    Se si omette un elenco di file, si farà il commit di tutte le\n"
@@ -6059,6 +6551,14 @@
 "    Se non è specificato nessun messaggio di commit, l'editor\n"
 "    configurato viene lanciato per inserire un messaggio."
 
+msgid ""
+"    Returns 0 on success, 1 if nothing changed.\n"
+"    "
+msgstr ""
+
+msgid "can only close branch heads"
+msgstr ""
+
 msgid "nothing changed\n"
 msgstr "nulla è cambiato\n"
 
@@ -6066,6 +6566,10 @@
 msgstr "creata una nuova head\n"
 
 #, python-format
+msgid "reopening closed branch head %d\n"
+msgstr ""
+
+#, python-format
 msgid "committed changeset %d:%s\n"
 msgstr "effettuato il commit del changeset %d:%s\n"
 
@@ -6086,79 +6590,164 @@
 
 msgid ""
 "    This command takes effect with the next commit. To undo a copy\n"
-"    before that, see hg revert.\n"
+"    before that, see :hg:`revert`."
+msgstr ""
+
+msgid ""
+"    Returns 0 on success, 1 if errors are encountered.\n"
 "    "
 msgstr ""
 
 msgid "find the ancestor revision of two revisions in a given index"
 msgstr ""
 
-msgid "There is no Mercurial repository here (.hg not found)"
-msgstr "Non esiste alcun repository Mercurial qui (.hg non trovata)"
-
 msgid "either two or three arguments required"
 msgstr "due o tre argomenti sono richiesti"
 
-msgid "returns the completion list associated with the given command"
-msgstr "restituisce l'elenco di completamento associato al dato comando"
-
-msgid "rebuild the dirstate as it would look like for the given revision"
+msgid "builds a repo with a given dag from scratch in the current empty repo"
 msgstr ""
 
-msgid "validate the correctness of the current dirstate"
+msgid "    Elements:"
 msgstr ""
 
-#, python-format
-msgid "%s in state %s, but not in manifest1\n"
-msgstr "%s è nello state %s, ma non nel manifest1\n"
-
-#, python-format
-msgid "%s in state %s, but also in manifest1\n"
-msgstr "%s è nello state %s, ma anche nel manifest1\n"
-
-#, python-format
-msgid "%s in state %s, but not in either manifest\n"
-msgstr "%s è nello state %s, ma non in uno dei manifesti\n"
-
-#, python-format
-msgid "%s in manifest1, but listed as state %s"
+msgid ""
+"     - \"+n\" is a linear run of n nodes based on the current default "
+"parent\n"
+"     - \".\" is a single node based on the current default parent\n"
+"     - \"$\" resets the default parent to null (implied at the start);\n"
+"           otherwise the default parent is always the last node created\n"
+"     - \" %s\n"
 msgstr ""
 
+msgid "format the changelog or an index DAG as a concise textual description"
+msgstr ""
+
+msgid ""
+"    If you pass a revlog index, the revlog's DAG is emitted. If you list\n"
+"    revision numbers, they get labelled in the output as rN."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    Otherwise, the changelog DAG of the current repo is emitted.\n"
+"    "
+msgstr ""
+"    Stampa la directory radice del repository corrente.\n"
+"    "
+
+msgid "need repo for changelog dag"
+msgstr ""
+
 msgid "dump the contents of a data file revision"
 msgstr ""
 
@@ -6221,10 +6829,14 @@
 msgid " patch test failed!\n"
 msgstr ""
 
-msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n"
+msgid ""
+" (Current patch tool may be incompatible with patch, or misconfigured. "
+"Please check your .hgrc file)\n"
 msgstr ""
 
-msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n"
+msgid ""
+" Internal patcher failure, please report this error to http://mercurial."
+"selenic.com/bts/\n"
 msgstr ""
 
 msgid "Checking commit editor...\n"
@@ -6283,6 +6895,11 @@
 msgstr ""
 
 msgid ""
+"    Alternatively you can specify -c/--change with a revision to see\n"
+"    the changes in that changeset relative to its first parent."
+msgstr ""
+
+msgid ""
 "    Without the -a/--text option, diff will avoid generating diffs of\n"
 "    files it detects as binary. With -a, diff will generate a diff\n"
 "    anyway, probably with undesirable results."
@@ -6290,8 +6907,7 @@
 
 msgid ""
 "    Use the -g/--git option to generate diffs in the git extended diff\n"
-"    format. For more information, read 'hg help diffs'.\n"
-"    "
+"    format. For more information, read :hg:`help diffs`."
 msgstr ""
 
 msgid "dump the header and diffs for one or more changesets"
@@ -6301,8 +6917,9 @@
 msgstr ""
 
 msgid ""
-"    The information shown in the changeset header is: author,\n"
-"    changeset hash, parent(s) and commit comment."
+"    The information shown in the changeset header is: author, date,\n"
+"    branch name (if non-default), changeset hash, parent(s) and commit\n"
+"    comment."
 msgstr ""
 
 msgid ""
@@ -6313,18 +6930,18 @@
 
 msgid ""
 "    Output may be to a file, in which case the name of the file is\n"
-"    given using a format string. The formatting rules are as follows::"
+"    given using a format string. The formatting rules are as follows:"
 msgstr ""
 
 msgid ""
-"      %%   literal \"%\" character\n"
-"      %H   changeset hash (40 bytes of hexadecimal)\n"
-"      %N   number of patches being generated\n"
-"      %R   changeset revision number\n"
-"      %b   basename of the exporting repository\n"
-"      %h   short-form changeset hash (12 bytes of hexadecimal)\n"
-"      %n   zero-padded sequence number, starting at 1\n"
-"      %r   zero-padded changeset revision number"
+"    :``%%``: literal \"%\" character\n"
+"    :``%H``: changeset hash (40 bytes of hexadecimal)\n"
+"    :``%N``: number of patches being generated\n"
+"    :``%R``: changeset revision number\n"
+"    :``%b``: basename of the exporting repository\n"
+"    :``%h``: short-form changeset hash (12 bytes of hexadecimal)\n"
+"    :``%n``: zero-padded sequence number, starting at 1\n"
+"    :``%r``: zero-padded changeset revision number"
 msgstr ""
 
 msgid ""
@@ -6333,15 +6950,20 @@
 "    diff anyway, probably with undesirable results."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "    Use the -g/--git option to generate diffs in the git extended diff\n"
-"    format. See 'hg help diffs' for more information."
+"    format. See :hg:`help diffs` for more information."
 msgstr ""
+"    Usa l'opzione --git per mantenere la patch nel formato diff esteso\n"
+"    git. Leggere le informazioni di aiuto sui diff per maggiori\n"
+"    informazioni sul motivo per cui quest'opzione importante per\n"
+"    preservare modifiche di permessi e informazioni su copie/rinomine.\n"
+"    "
 
 msgid ""
 "    With the --switch-parent option, the diff will be against the\n"
-"    second parent. It can be useful to review a merge.\n"
-"    "
+"    second parent. It can be useful to review a merge."
 msgstr ""
 
 msgid "export requires at least one changeset"
@@ -6367,9 +6989,7 @@
 "    working directory."
 msgstr ""
 
-msgid ""
-"    To undo a forget before the next commit, see hg add.\n"
-"    "
+msgid "    To undo a forget before the next commit, see :hg:`add`."
 msgstr ""
 
 msgid "no files specified"
@@ -6397,7 +7017,11 @@
 "    file in which it finds a match. To get it to print every revision\n"
 "    that contains a change in match status (\"-\" for a match that\n"
 "    becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
-"    use the --all flag.\n"
+"    use the --all flag."
+msgstr ""
+
+msgid ""
+"    Returns 0 if a match is found, 1 otherwise.\n"
 "    "
 msgstr ""
 
@@ -6408,61 +7032,58 @@
 msgid "show current repository heads or show branch heads"
 msgstr ""
 
-msgid "    With no arguments, show all repository head changesets."
-msgstr ""
+#, fuzzy
+msgid "    With no arguments, show all repository branch heads."
+msgstr "    Senza argomenti stampa un elenco dei comandi ed un breve aiuto."
 
 msgid ""
 "    Repository \"heads\" are changesets with no child changesets. They are\n"
 "    where development generally takes place and are the usual targets\n"
-"    for update and merge operations."
+"    for update and merge operations. Branch heads are changesets that have\n"
+"    no child changeset on the same branch."
 msgstr ""
 
 msgid ""
-"    If one or more REV is given, the \"branch heads\" will be shown for\n"
-"    the named branch associated with the specified changeset(s)."
+"    If one or more REVs are given, only branch heads on the branches\n"
+"    associated with the specified changesets are shown."
 msgstr ""
 
 msgid ""
-"    Branch heads are changesets on a named branch with no descendants on\n"
-"    the same branch. A branch head could be a \"true\" (repository) head,\n"
-"    or it could be the last changeset on that branch before it was\n"
-"    merged into another branch, or it could be the last changeset on the\n"
-"    branch before a new branch was created. If none of the branch heads\n"
-"    are true heads, the branch is considered inactive."
+"    If -c/--closed is specified, also show branch heads marked closed\n"
+"    (see :hg:`commit --close-branch`)."
 msgstr ""
 
 msgid ""
-"    If -c/--closed is specified, also show branch heads marked closed\n"
-"    (see hg commit --close-branch)."
+"    If STARTREV is specified, only those heads that are descendants of\n"
+"    STARTREV will be displayed."
 msgstr ""
 
 msgid ""
-"    If STARTREV is specified, only those heads that are descendants of\n"
-"    STARTREV will be displayed.\n"
-"    "
+"    If -t/--topo is specified, named branch mechanics will be ignored and "
+"only\n"
+"    changesets without children will be shown."
 msgstr ""
 
-msgid "you must specify a branch to use --closed"
+msgid ""
+"    Returns 0 if matching heads are found, 1 if not.\n"
+"    "
 msgstr ""
 
 #, fuzzy, python-format
-msgid "no open branch heads on branch %s\n"
+msgid "no open branch heads found on branches %s"
 msgstr "svn: la branch non ha nessuna revisione %s"
 
-#, python-format
-msgid "no changes on branch %s containing %s are reachable from %s\n"
-msgstr ""
-
-#, python-format
-msgid "no changes on branch %s are reachable from %s\n"
-msgstr ""
+#, fuzzy, python-format
+msgid " (started at %s)"
+msgstr " (default: %s)"
 
 #, fuzzy
 msgid "show help for a given topic or a help overview"
 msgstr "mostra l'aiuto per un dato argomento o una panoramica d'aiuto"
 
 #, fuzzy
-msgid "    With no arguments, print a list of commands with short help messages."
+msgid ""
+"    With no arguments, print a list of commands with short help messages."
 msgstr "    Senza argomenti stampa un elenco dei comandi ed un breve aiuto."
 
 #, fuzzy
@@ -6473,6 +7094,11 @@
 "    Dato un argomento, estensione o nome di comando, stampa l'aiuto\n"
 "    per tale argomento."
 
+msgid ""
+"    Returns 0 if successful.\n"
+"    "
+msgstr ""
+
 msgid "global options:"
 msgstr "opzioni globali:"
 
@@ -6480,7 +7106,9 @@
 msgstr "usare \"hg help\" per l'elenco completo dei comandi"
 
 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
-msgstr "usare \"hg help\" per la lista completa dei comandi oppure \"hg -v\" per i dettagli"
+msgstr ""
+"usare \"hg help\" per la lista completa dei comandi oppure \"hg -v\" per i "
+"dettagli"
 
 #, python-format
 msgid "use \"hg -v help%s\" to show aliases and global options"
@@ -6504,19 +7132,28 @@
 msgid "(no help text available)"
 msgstr "(nessun testo di aiuto disponibile)"
 
+#, fuzzy, python-format
+msgid "alias for: hg %s"
+msgstr ""
+"\n"
+"alias: %s\n"
+
+#, python-format
+msgid "%s"
+msgstr ""
+
+#, fuzzy, python-format
+msgid ""
+"\n"
+"use \"hg -v help %s\" to show verbose help\n"
+msgstr "usare \"hg -v help %s\" per mostrare le opzioni globali"
+
 msgid "options:\n"
 msgstr "opzioni:\n"
 
 msgid "no commands defined\n"
 msgstr "nessun comando definito\n"
 
-#, fuzzy
-msgid "enabled extensions:"
-msgstr ""
-"\n"
-"estensioni abilitate:\n"
-"\n"
-
 msgid "no help text available"
 msgstr "nessun testo di aiuto disponibile"
 
@@ -6524,12 +7161,37 @@
 msgid "%s extension - %s"
 msgstr "estensione %s - %s\n"
 
+msgid "use \"hg help extensions\" for information on enabling extensions\n"
+msgstr ""
+
+#, python-format
+msgid "'%s' is provided by the following extension:"
+msgstr ""
+
 msgid "Mercurial Distributed SCM\n"
 msgstr "Mercurial SCM Distribuito\n"
 
 msgid "basic commands:"
 msgstr "comandi base:"
 
+#, fuzzy
+msgid "enabled extensions:"
+msgstr ""
+"\n"
+"estensioni abilitate:\n"
+"\n"
+
+msgid "VALUE"
+msgstr ""
+
+msgid "DEPRECATED"
+msgstr ""
+
+msgid ""
+"\n"
+"[+] marked option can be specified multiple times"
+msgstr ""
+
 msgid ""
 "\n"
 "additional help topics:"
@@ -6560,8 +7222,7 @@
 "    This summary identifies the repository state using one or two\n"
 "    parent hash identifiers, followed by a \"+\" if there are\n"
 "    uncommitted changes in the working directory, a list of tags for\n"
-"    this revision and a branch name for non-default branches.\n"
-"    "
+"    this revision and a branch name for non-default branches."
 msgstr ""
 "    Questo sommario identifica lo stato del repository usando uno o\n"
 "    due hash dei genitori, seguito da un \"+\" se ci sono modifiche di\n"
@@ -6575,7 +7236,9 @@
 msgstr "importa un insieme ordinato di patch"
 
 #, fuzzy
-msgid "    Import a list of patches and commit them individually."
+msgid ""
+"    Import a list of patches and commit them individually (unless\n"
+"    --no-commit is specified)."
 msgstr ""
 "    Importa un elenco di patch e ne effettua il commit\n"
 "    individualmente."
@@ -6607,7 +7270,7 @@
 
 #, fuzzy
 msgid ""
-"    If the imported patch was generated by hg export, user and\n"
+"    If the imported patch was generated by :hg:`export`, user and\n"
 "    description from patch override values from message headers and\n"
 "    body. Values given on command line with -m/--message and -u/--user\n"
 "    override these."
@@ -6644,19 +7307,16 @@
 msgid ""
 "    To read a patch from standard input, use \"-\" as the patch name. If\n"
 "    a URL is specified, the patch will be downloaded from it.\n"
-"    See 'hg help dates' for a list of formats valid for -d/--date.\n"
-"    "
+"    See :hg:`help dates` for a list of formats valid for -d/--date."
 msgstr ""
 "    Per leggere una patch dallo standard input, usare come nome della\n"
 "    patch \"-\". Vedere 'hg help dates' per un elenco dei formati validi\n"
 "    per -d/--date.\n"
 "    "
 
-msgid "applying patch from stdin\n"
-msgstr "sto applicando patch dallo stdin\n"
-
-msgid "no diffs found"
-msgstr "nessun diff trovato"
+#, fuzzy
+msgid "to working directory"
+msgstr "aggiorna la directory di lavoro"
 
 #, fuzzy
 msgid "not a Mercurial patch"
@@ -6665,6 +7325,16 @@
 msgid "patch is damaged or loses information"
 msgstr "la patch è danneggiata o perde informazioni"
 
+msgid "applying patch from stdin\n"
+msgstr "sto applicando patch dallo stdin\n"
+
+#, fuzzy, python-format
+msgid "applied %s\n"
+msgstr "sto applicando %s\n"
+
+msgid "no diffs found"
+msgstr "nessun diff trovato"
+
 #, fuzzy
 msgid "show new changesets found in source"
 msgstr "mostra i nuovi changeset trovati nella sorgente"
@@ -6688,13 +7358,16 @@
 "    i changeset se incoming è seguito da un pull."
 
 #, fuzzy
-msgid ""
-"    See pull for valid source format details.\n"
-"    "
+msgid "    See pull for valid source format details."
 msgstr ""
 "    Vedere pull per dettagli sui formati di sorgenti validi.\n"
 "    "
 
+msgid ""
+"    Returns 0 if there are incoming changes, 1 otherwise.\n"
+"    "
+msgstr ""
+
 #, fuzzy
 msgid "create a new repository in the given directory"
 msgstr "crea un nuovo repository nella directory data"
@@ -6714,8 +7387,7 @@
 #, fuzzy
 msgid ""
 "    It is possible to specify an ``ssh://`` URL as the destination.\n"
-"    See 'hg help urls' for more information.\n"
-"    "
+"    See :hg:`help urls` for more information."
 msgstr ""
 "    E' possibile specificare un URL ``ssh://`` come destinazione.\n"
 "    Vedere 'hg help urls' per maggiorni informazioni.\n"
@@ -6756,8 +7428,7 @@
 "    If you want to feed the output of this command into the \"xargs\"\n"
 "    command, use the -0 option to both this command and \"xargs\". This\n"
 "    will avoid the problem of \"xargs\" treating single filenames that\n"
-"    contain whitespace as multiple filenames.\n"
-"    "
+"    contain whitespace as multiple filenames."
 msgstr ""
 "    Se si desidera fornire l'output di questo comando al comando\n"
 "    \"xargs\", usare l'opzione \"-0\" sia per questo comando sia per\n"
@@ -6873,7 +7544,8 @@
 msgid ""
 "    If no revision range is specified, the default is tip:0 unless\n"
 "    --follow is set, in which case the working directory parent is\n"
-"    used as the starting revision."
+"    used as the starting revision. You can specify a revision set for\n"
+"    log, see :hg:`help revsets` for more information."
 msgstr ""
 "show revision history of entire repository or files\n"
 "\n"
@@ -6945,8 +7617,7 @@
 "    NOTE: log -p/--patch may generate unexpected diff output for merge\n"
 "    changesets, as it will only compare the merge changeset against\n"
 "    its first parent. Also, only files different from BOTH parents\n"
-"    will appear in files:.\n"
-"    "
+"    will appear in files:."
 msgstr ""
 "show revision history of entire repository or files\n"
 "\n"
@@ -6988,8 +7659,7 @@
 
 msgid ""
 "    With -v, print file permissions, symlink and executable bits.\n"
-"    With --debug, print file revision hashes.\n"
-"    "
+"    With --debug, print file revision hashes."
 msgstr ""
 
 msgid "merge working directory with another revision"
@@ -7011,16 +7681,30 @@
 "    If no revision is specified, the working directory's parent is a\n"
 "    head revision, and the current branch contains exactly one other\n"
 "    head, the other head is merged with by default. Otherwise, an\n"
-"    explicit revision with which to merge with must be provided.\n"
+"    explicit revision with which to merge with must be provided."
+msgstr ""
+
+msgid ""
+"    To undo an uncommitted merge, use :hg:`update --clean .` which\n"
+"    will check out a clean copy of the original merge parent, losing\n"
+"    all changes."
+msgstr ""
+
+msgid ""
+"    Returns 0 on success, 1 if there are unresolved files.\n"
 "    "
 msgstr ""
 
-#, python-format
-msgid "branch '%s' has %d heads - please merge with an explicit rev"
+#, fuzzy, python-format
+msgid ""
+"branch '%s' has %d heads - please merge with an explicit rev\n"
+"(run 'hg heads .' to see heads)"
 msgstr "la branch '%s' ha %d head - fare il merge con una revisione esplicita"
 
-#, python-format
-msgid "branch '%s' has one head - please merge with an explicit rev"
+#, fuzzy, python-format
+msgid ""
+"branch '%s' has one head - please merge with an explicit rev\n"
+"(run 'hg heads' to see all heads)"
 msgstr "la branch '%s' ha una head - fare il merge con una revisione esplicita"
 
 msgid "there is nothing to merge"
@@ -7030,13 +7714,15 @@
 msgid "%s - use \"hg update\" instead"
 msgstr "%s - invece usare \"hg update\""
 
-msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev"
+msgid ""
+"working dir not at a head rev - use \"hg update\" or merge with an explicit "
+"rev"
 msgstr ""
 "la directory di lavoro non è una revisione head - usare \"hg update\"\n"
 "o fare il merge con una revisione esplicita"
 
 #, fuzzy
-msgid "show changesets not found in destination"
+msgid "show changesets not found in the destination"
 msgstr "mostra changeset non trovati nella destinazione"
 
 #, fuzzy
@@ -7051,13 +7737,16 @@
 "    richiesto."
 
 #, fuzzy
-msgid ""
-"    See pull for valid destination format details.\n"
-"    "
+msgid "    See pull for details of valid destination formats."
 msgstr ""
 "    Vedere pull per dettagli sui formati validi di destinazioni.\n"
 "    "
 
+msgid ""
+"    Returns 0 if there are outgoing changes, 1 otherwise.\n"
+"    "
+msgstr ""
+
 #, fuzzy
 msgid "show the parents of the working directory or revision"
 msgstr "mostra i genitori della directory di lavoro o di una revisione"
@@ -7068,8 +7757,7 @@
 "    given via -r/--rev, the parent of that revision will be printed.\n"
 "    If a file argument is given, the revision in which the file was\n"
 "    last changed (before the working directory revision or the\n"
-"    argument to --rev if given) is printed.\n"
-"    "
+"    argument to --rev if given) is printed."
 msgstr ""
 "    Stampa le revisioni genitori della directory di lavoro. Se una\n"
 "    revisione è data tramite --rev, verrà stampato il genitore di\n"
@@ -7096,13 +7784,25 @@
 msgstr ""
 
 msgid ""
-"    Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
-"    and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too."
+"    Path names are defined in the [paths] section of\n"
+"    ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n"
+"    repository, ``.hg/hgrc`` is used, too."
 msgstr ""
 
 msgid ""
-"    See 'hg help urls' for more information.\n"
-"    "
+"    The path names ``default`` and ``default-push`` have a special\n"
+"    meaning.  When performing a push or pull operation, they are used\n"
+"    as fallbacks if no location is specified on the command-line.\n"
+"    When ``default-push`` is set, it will be used for push and\n"
+"    ``default`` will be used for pull; otherwise ``default`` is used\n"
+"    as the fallback for both.  When cloning a repository, the clone\n"
+"    source is written as ``default`` in ``.hg/hgrc``.  Note that\n"
+"    ``default`` and ``default-push`` apply to all inbound (e.g.\n"
+"    :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and\n"
+"    :hg:`bundle`) operations."
+msgstr ""
+
+msgid "    See :hg:`help urls` for more information."
 msgstr ""
 
 msgid "not found!\n"
@@ -7124,8 +7824,10 @@
 "\n"
 "    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
 "\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia del\n"
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
+"    e le aggiunge al repository locale. Di default non aggiorna la copia "
+"del\n"
 "    progetto nella directory di lavoro.\n"
 "\n"
 "    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
@@ -7139,8 +7841,10 @@
 "\n"
 "    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
 "\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia del\n"
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
+"    e le aggiunge al repository locale. Di default non aggiorna la copia "
+"del\n"
 "    progetto nella directory di lavoro.\n"
 "\n"
 "    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
@@ -7158,8 +7862,10 @@
 "\n"
 "    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
 "\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia del\n"
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
+"    e le aggiunge al repository locale. Di default non aggiorna la copia "
+"del\n"
 "    progetto nella directory di lavoro.\n"
 "\n"
 "    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
@@ -7168,17 +7874,19 @@
 
 #, fuzzy
 msgid ""
-"    Use hg incoming if you want to see what would have been added by a\n"
-"    pull at the time you issued this command. If you then decide to\n"
-"    added those changes to the repository, you should use pull -r X\n"
-"    where X is the last changeset listed by hg incoming."
+"    Use :hg:`incoming` if you want to see what would have been added\n"
+"    by a pull at the time you issued this command. If you then decide\n"
+"    to add those changes to the repository, you should use :hg:`pull\n"
+"    -r X` where ``X`` is the last changeset listed by :hg:`incoming`."
 msgstr ""
 "effettua il pull delle modifiche dalla sorgente specificata\n"
 "\n"
 "    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
 "\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia del\n"
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
+"    e le aggiunge al repository locale. Di default non aggiorna la copia "
+"del\n"
 "    progetto nella directory di lavoro.\n"
 "\n"
 "    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
@@ -7188,65 +7896,75 @@
 #, fuzzy
 msgid ""
 "    If SOURCE is omitted, the 'default' path will be used.\n"
-"    See 'hg help urls' for more information.\n"
-"    "
+"    See :hg:`help urls` for more information."
 msgstr ""
 "effettua il pull delle modifiche dalla sorgente specificata\n"
 "\n"
 "    Effettua il pull di modifiche da un repository remoto in uno locale.\n"
 "\n"
-"    Questo trova tutte le modifiche dal repository al percorso o URL specificato\n"
-"    e le aggiunge al repository locale. Di default non aggiorna la copia del\n"
+"    Questo trova tutte le modifiche dal repository al percorso o URL "
+"specificato\n"
+"    e le aggiunge al repository locale. Di default non aggiorna la copia "
+"del\n"
 "    progetto nella directory di lavoro.\n"
 "\n"
 "    Se SOURCE viene omesso, verrà usato il percorso 'default'.\n"
 "    Vedere 'hg help urls' per maggiori informazioni.\n"
 "    "
 
+msgid ""
+"    Returns 0 on success, 1 if an update had unresolved files.\n"
+"    "
+msgstr ""
+
 #, fuzzy
 msgid "push changes to the specified destination"
 msgstr "effettua il push di modifiche verso la destinazione specificata"
 
 #, fuzzy
-msgid "    Push changes from the local repository to the given destination."
+msgid ""
+"    Push changesets from the local repository to the specified\n"
+"    destination."
 msgstr ""
 "    Effettua il push di modifiche dal repository locale verso la\n"
 "    destinazione data."
 
-#, fuzzy
 msgid ""
-"    This is the symmetrical operation for pull. It moves changes from\n"
-"    the current repository to a different one. If the destination is\n"
-"    local this is identical to a pull in that directory from the\n"
-"    current one."
+"    This operation is symmetrical to pull: it is identical to a pull\n"
+"    in the destination repository from the current one."
+msgstr ""
+
+msgid ""
+"    By default, push will not allow creation of new heads at the\n"
+"    destination, since multiple heads would make it unclear which head\n"
+"    to use. In this situation, it is recommended to pull and merge\n"
+"    before pushing."
 msgstr ""
-"    Questa è l'operazione simmetrica di pull. Aiuta a spostare modifiche\n"
-"    dal repository corrente in un altro. Se la destinazione è locale questo\n"
-"    è identico ad un pull in quella directory verso questa."
 
-#, fuzzy
 msgid ""
-"    By default, push will refuse to run if it detects the result would\n"
-"    increase the number of remote heads. This generally indicates the\n"
-"    user forgot to pull and merge before pushing."
+"    Use --new-branch if you want to allow push to create a new named\n"
+"    branch that is not present at the destination. This allows you to\n"
+"    only create a new branch without forcing other changes."
+msgstr ""
+
+msgid ""
+"    Use -f/--force to override the default behavior and push all\n"
+"    changesets on all branches."
 msgstr ""
-"    Di default, il push verrà rifiutato se viene rivelato che aumenterà il\n"
-"    numerdo di head remote. Questo generalmente indica che il client ha\n"
-"    dimenticato di fare pull e merge prima del push."
 
 #, fuzzy
 msgid ""
-"    If -r/--rev is used, the named revision and all its ancestors will\n"
-"    be pushed to the remote repository."
+"    If -r/--rev is used, the specified revision and all its ancestors\n"
+"    will be pushed to the remote repository."
 msgstr ""
-"    Se si usa -r, si farà il push del changeset dato e tutti i suoi antenati\n"
+"    Se si usa -r, si farà il push del changeset dato e tutti i suoi "
+"antenati\n"
 "    verso il repository remoto."
 
 #, fuzzy
 msgid ""
-"    Please see 'hg help urls' for important details about ``ssh://``\n"
-"    URLs. If DESTINATION is omitted, a default path will be used.\n"
-"    "
+"    Please see :hg:`help urls` for important details about ``ssh://``\n"
+"    URLs. If DESTINATION is omitted, a default path will be used."
 msgstr ""
 "    Vedere il testo di aiuto per gli url per importanti dettagli sugli\n"
 "    URL ``ssh://``.\n"
@@ -7254,6 +7972,11 @@
 "    Vedere 'hg help urls' per maggiori informazioni.\n"
 "    "
 
+msgid ""
+"    Returns 0 if push was successful, 1 if nothing to push.\n"
+"    "
+msgstr ""
+
 #, python-format
 msgid "pushing to %s\n"
 msgstr "sto effettuando il push verso %s\n"
@@ -7270,14 +7993,18 @@
 msgid ""
 "    This command tries to fix the repository status after an\n"
 "    interrupted operation. It should only be necessary when Mercurial\n"
-"    suggests it.\n"
-"    "
+"    suggests it."
 msgstr ""
 "    Questo comando prova a correggere lo stato del repository dopo\n"
 "    un'operazione interrotta. Dovrebbe essere necessario solamente\n"
 "    quando Mercurial lo suggerisce.\n"
 "    "
 
+msgid ""
+"    Returns 0 if successful, 1 if nothing to recover or verify fails.\n"
+"    "
+msgstr ""
+
 msgid "remove the specified files on the next commit"
 msgstr ""
 
@@ -7296,8 +8023,8 @@
 "    The following table details the behavior of remove for different\n"
 "    file states (columns) and option combinations (rows). The file\n"
 "    states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
-"    reported by hg status). The actions are Warn, Remove (from branch)\n"
-"    and Delete (from disk)::"
+"    reported by :hg:`status`). The actions are Warn, Remove (from\n"
+"    branch) and Delete (from disk)::"
 msgstr ""
 
 msgid ""
@@ -7310,7 +8037,11 @@
 
 msgid ""
 "    This command schedules the files to be removed at the next commit.\n"
-"    To undo a remove before that, see hg revert.\n"
+"    To undo a remove before that, see :hg:`revert`."
+msgstr ""
+
+msgid ""
+"    Returns 0 on success, 1 if any warnings encountered.\n"
 "    "
 msgstr ""
 
@@ -7342,37 +8073,46 @@
 
 msgid ""
 "    This command takes effect at the next commit. To undo a rename\n"
-"    before that, see hg revert.\n"
-"    "
+"    before that, see :hg:`revert`."
 msgstr ""
 
-msgid "retry file merges from a merge or update"
+msgid "various operations to help finish a merge"
 msgstr ""
 
 msgid ""
-"    This command will cleanly retry unresolved file merges using file\n"
-"    revisions preserved from the last update or merge. To attempt to\n"
-"    resolve all unresolved files, use the -a/--all switch."
+"    This command includes several actions that are often useful while\n"
+"    performing a merge, after running ``merge`` but before running\n"
+"    ``commit``.  (It is only meaningful if your working directory has\n"
+"    two parents.)  It is most relevant for merges with unresolved\n"
+"    conflicts, which are typically a result of non-interactive merging with\n"
+"    ``internal:merge`` or a command-line merge tool like ``diff3``."
 msgstr ""
 
-msgid ""
-"    If a conflict is resolved manually, please note that the changes\n"
-"    will be overwritten if the merge is retried with resolve. The\n"
-"    -m/--mark switch should be used to mark the file as resolved."
-msgstr ""
+#, fuzzy
+msgid "    The available actions are:"
+msgstr "%s non è più disponibile in %s"
 
 msgid ""
-"    This command also allows listing resolved files and manually\n"
-"    indicating whether or not files are resolved. All files must be\n"
-"    marked as resolved before a commit is permitted."
+"      1) list files that were merged with conflicts (U, for unresolved)\n"
+"         and without conflicts (R, for resolved): ``hg resolve -l``\n"
+"         (this is like ``status`` for merges)\n"
+"      2) record that you have resolved conflicts in certain files:\n"
+"         ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n"
+"      3) forget that you have resolved conflicts in certain files:\n"
+"         ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n"
+"      4) discard your current attempt(s) at resolving conflicts and\n"
+"         restart the merge from scratch: ``hg resolve file...``\n"
+"         (or ``-a`` for all unresolved files)"
 msgstr ""
 
-msgid "    The codes used to show the status of files are::"
+msgid ""
+"    Note that Mercurial will not let you commit files with unresolved merge\n"
+"    conflicts.  You must use ``hg resolve -m ...`` before you can commit\n"
+"    after a conflicting merge."
 msgstr ""
 
 msgid ""
-"      U = unresolved\n"
-"      R = resolved\n"
+"    Returns 0 on success, 1 if any files fail a resolve attempt.\n"
 "    "
 msgstr ""
 
@@ -7383,20 +8123,23 @@
 msgstr "non è possibile specificare pattern e --all"
 
 msgid "no files or directories specified; use --all to remerge all files"
-msgstr "nessun file o directory specificata; usare --all per rieffettuare il merge di tutti i file"
+msgstr ""
+"nessun file o directory specificata; usare --all per rieffettuare il merge "
+"di tutti i file"
 
 #, fuzzy
 msgid "restore individual files or directories to an earlier state"
 msgstr "ripristina file singoli o directory ad uno stato precedente"
 
-#, fuzzy
 msgid ""
-"    (Use update -r to check out earlier revisions, revert does not\n"
-"    change the working directory parents.)"
+"    NOTE: This command is most likely not what you are looking for. revert\n"
+"    will partially overwrite content in the working directory without "
+"changing\n"
+"    the working directory parents. Use :hg:`update -r rev` to check out "
+"earlier\n"
+"    revisions, or :hg:`update --clean .` to undo a merge which has added\n"
+"    another parent."
 msgstr ""
-"    (usare update -r per effettuare il checkout di revisioni\n"
-"    precedenti, revert non cambia i genitori della directory di\n"
-"    lavoro)"
 
 #, fuzzy
 msgid ""
@@ -7404,8 +8147,8 @@
 "    to the contents they had in the parent of the working directory.\n"
 "    This restores the contents of the affected files to an unmodified\n"
 "    state and unschedules adds, removes, copies, and renames. If the\n"
-"    working directory has two parents, you must explicitly specify the\n"
-"    revision to revert to."
+"    working directory has two parents, you must explicitly specify a\n"
+"    revision."
 msgstr ""
 "    Se nessuna revisione viene specificata, i file o directory\n"
 "    specificati vengono riportati al contenuto che avevano nel\n"
@@ -7419,8 +8162,8 @@
 msgid ""
 "    Using the -r/--rev option, revert the given files or directories\n"
 "    to their contents as of a specific revision. This can be helpful\n"
-"    to \"roll back\" some or all of an earlier change. See 'hg help\n"
-"    dates' for a list of formats valid for -d/--date."
+"    to \"roll back\" some or all of an earlier change. See :hg:`help\n"
+"    dates` for a list of formats valid for -d/--date."
 msgstr ""
 "    Usando l'opzione -r, riporta i dati file o directory al loro\n"
 "    contenuto ad una specifica revisione. Questo può essere utile per\n"
@@ -7462,8 +8205,7 @@
 #, fuzzy
 msgid ""
 "    Modified files are saved with a .orig suffix before reverting.\n"
-"    To disable these backups, use --no-backup.\n"
-"    "
+"    To disable these backups, use --no-backup."
 msgstr ""
 "    I file modificati vengono salvati con un suffisso .orig prima di\n"
 "    essere ripristinati. Per disabilitare questi backup, usare\n"
@@ -7474,7 +8216,9 @@
 msgstr "non è possibile specificare sia una revisione sia una data"
 
 msgid "no files or directories specified; use --all to revert the whole repo"
-msgstr "nessun file o directory specificati; usare --all per ripristinare l'intero repository"
+msgstr ""
+"nessun file o directory specificati; usare --all per ripristinare l'intero "
+"repository"
 
 #, python-format
 msgid "forgetting %s\n"
@@ -7501,7 +8245,7 @@
 msgstr "nessuna modifica richiesta per %s\n"
 
 #, fuzzy
-msgid "roll back the last transaction"
+msgid "roll back the last transaction (dangerous)"
 msgstr "effettua il rollback dell'ultima transazione"
 
 #, fuzzy
@@ -7522,7 +8266,7 @@
 "    Transactions are used to encapsulate the effects of all commands\n"
 "    that create new changesets or propagate existing changesets into a\n"
 "    repository. For example, the following commands are transactional,\n"
-"    and their effects can be rolled back::"
+"    and their effects can be rolled back:"
 msgstr ""
 "    Le transazioni sono usate per incapsulare gli effetti di tutti i\n"
 "    comandi che creano nuovi changeset o propagano changeset esistenti\n"
@@ -7532,11 +8276,11 @@
 
 #, fuzzy
 msgid ""
-"      commit\n"
-"      import\n"
-"      pull\n"
-"      push (with this repository as destination)\n"
-"      unbundle"
+"    - commit\n"
+"    - import\n"
+"    - pull\n"
+"    - push (with this repository as the destination)\n"
+"    - unbundle"
 msgstr ""
 "      commit\n"
 "      import\n"
@@ -7551,8 +8295,7 @@
 "    back locally is ineffective (someone else may already have pulled\n"
 "    the changes). Furthermore, a race is possible with readers of the\n"
 "    repository; for example an in-progress pull from the repository\n"
-"    may fail if a rollback is performed.\n"
-"    "
+"    may fail if a rollback is performed."
 msgstr ""
 "    L'uso di questo comando non è inteso per repository pubblici. Una\n"
 "    volta che le modifiche sono visibili per il pull da parte di altri\n"
@@ -7563,38 +8306,56 @@
 "    repository potrebbe fallire se viene effettuato un rollback.\n"
 "    "
 
+msgid ""
+"    Returns 0 on success, 1 if no rollback data is available.\n"
+"    "
+msgstr ""
+
 #, fuzzy
 msgid "print the root (top) of the current working directory"
 msgstr "stampa la radice (top) della directory di lavoro corrente"
 
 #, fuzzy
-msgid ""
-"    Print the root directory of the current repository.\n"
-"    "
+msgid "    Print the root directory of the current repository."
 msgstr ""
 "    Stampa la directory radice del repository corrente.\n"
 "    "
 
-#, fuzzy
-msgid "export the repository via HTTP"
-msgstr "esporta il repository via HTTP"
+msgid "start stand-alone webserver"
+msgstr ""
 
-#, fuzzy
-msgid "    Start a local HTTP repository browser and pull server."
-msgstr "    Avvia un server HTTP locale per il pull e la navigazione."
+msgid ""
+"    Start a local HTTP repository browser and pull server. You can use\n"
+"    this for ad-hoc sharing and browing of repositories. It is\n"
+"    recommended to use a real web server to serve a repository for\n"
+"    longer periods of time."
+msgstr ""
+
+msgid ""
+"    Please note that the server does not implement access control.\n"
+"    This means that, by default, anybody can read from the server and\n"
+"    nobody can write to it by default. Set the ``web.allow_push``\n"
+"    option to ``*`` to allow everybody to push to the server. You\n"
+"    should use a real web server if you need to authenticate users."
+msgstr ""
 
 #, fuzzy
 msgid ""
 "    By default, the server logs accesses to stdout and errors to\n"
 "    stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
-"    files.\n"
-"    "
+"    files."
 msgstr ""
 "    Di default i log del server vengono inviati allo stdout e gli\n"
 "    errori allo stderr. Usare le opzioni \"-A\" e \"-E\" per effettuare il\n"
 "    log su file.\n"
 "    "
 
+msgid ""
+"    To have the server choose a free port number to listen on, specify\n"
+"    a port number of 0; in this case, the server will print the port\n"
+"    number it uses."
+msgstr ""
+
 #, python-format
 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
 msgstr "in ascolto su http://%s%s/%s (limitato a %s:%d)\n"
@@ -7626,7 +8387,11 @@
 msgid ""
 "    If one revision is given, it is used as the base revision.\n"
 "    If two revisions are given, the differences between them are\n"
-"    shown."
+"    shown. The --change option can also be used as a shortcut to list\n"
+"    the changed files of a revision from its first parent."
+msgstr ""
+
+msgid "    The codes used to show the status of files are::"
 msgstr ""
 
 msgid ""
@@ -7637,8 +8402,7 @@
 "      ! = missing (deleted by non-hg command, but still tracked)\n"
 "      ? = not tracked\n"
 "      I = ignored\n"
-"        = origin of the previous file listed as A (added)\n"
-"    "
+"        = origin of the previous file listed as A (added)"
 msgstr ""
 
 msgid "summarize working directory state"
@@ -7651,103 +8415,110 @@
 
 msgid ""
 "    With the --remote option, this will check the default paths for\n"
-"    incoming and outgoing changes. This can be time-consuming.\n"
-"    "
+"    incoming and outgoing changes. This can be time-consuming."
 msgstr ""
 
-#, fuzzy
+#, python-format
+msgid "parent: %d:%s "
+msgstr "genitore: %d:%s "
+
 msgid " (empty repository)"
-msgstr "repository·%s"
+msgstr " (repository vuoto)"
 
-#, fuzzy
 msgid " (no revision checked out)"
-msgstr "nessuna revisione specificata"
-
-#, fuzzy, python-format
-msgid "parent: %d:%s %s\n"
-msgstr "genitore:    %d:%s\n"
+msgstr " (nessuna revisione in check out)"
 
-#, fuzzy, python-format
+#, python-format
 msgid "branch: %s\n"
-msgstr "branch:      %s\n"
-
-#, fuzzy, python-format
-msgid "%d added"
-msgstr "%s non aggiunto!\n"
+msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "%d modified"
-msgstr "è modificato"
+msgstr "%d modificati"
 
-#, fuzzy, python-format
+#, python-format
+msgid "%d added"
+msgstr "%d aggiunti"
+
+#, python-format
 msgid "%d removed"
-msgstr "rimossi"
+msgstr "%d rimossi"
 
 #, python-format
-msgid "%d deleted"
-msgstr ""
+msgid "%d renamed"
+msgstr "%d rinominati"
 
-#, fuzzy, python-format
-msgid "%d ignored"
-msgstr "ignorato"
+#, python-format
+msgid "%d copied"
+msgstr "%d copiati"
 
-#, fuzzy, python-format
+#, python-format
+msgid "%d deleted"
+msgstr "%d cancellati"
+
+#, python-format
 msgid "%d unknown"
-msgstr "base sconosciuta"
+msgstr "%d sconosciuti"
 
-#, fuzzy, python-format
+#, python-format
+msgid "%d ignored"
+msgstr "%d ignorati"
+
+#, python-format
 msgid "%d unresolved"
-msgstr "non risolti"
+msgstr "%d non risolti"
+
+#, python-format
+msgid "%d subrepos"
+msgstr "%d subrepository"
 
-#, fuzzy
 msgid " (merge)"
-msgstr "merge"
+msgstr ""
 
-#, fuzzy
 msgid " (new branch)"
-msgstr "mostra le branch"
+msgstr " (nuovo branch)"
+
+msgid " (head closed)"
+msgstr " (head chiusa)"
 
 msgid " (clean)"
-msgstr ""
+msgstr " (pulito)"
 
 msgid " (new branch head)"
-msgstr ""
+msgstr " (nuova head per il branch)"
 
-#, fuzzy, python-format
+#, python-format
 msgid "commit: %s\n"
-msgstr "convert: %s\n"
+msgstr ""
 
 msgid "update: (current)\n"
-msgstr ""
+msgstr "update: (aggiornato)\n"
 
-#, fuzzy, python-format
+#, python-format
 msgid "update: %d new changesets (update)\n"
-msgstr "%s: %d nuovi changeset"
+msgstr "update: %d nuovi changeset (update)\n"
 
 #, python-format
 msgid "update: %d new changesets, %d branch heads (merge)\n"
-msgstr ""
+msgstr "update: %d nuovi changeset, %d head del branch (merge)\n"
 
 msgid "1 or more incoming"
-msgstr ""
+msgstr "1 o più in arrivo"
 
 #, python-format
 msgid "%d outgoing"
-msgstr ""
+msgstr "%d in uscita"
 
-#, fuzzy, python-format
+#, python-format
 msgid "remote: %s\n"
-msgstr "remoto: "
+msgstr "remoto: %s\n"
 
-#, fuzzy
 msgid "remote: (synced)\n"
-msgstr "remoto: "
+msgstr "remoto: (sincronizzato)\n"
 
-#, fuzzy
 msgid "add one or more tags for the current or given revision"
-msgstr "aggiunge una o più tag per la revisione corrente o data"
+msgstr "aggiunge una o più tag per la revisione corrente o quella data"
 
-#, fuzzy
 msgid "    Name a particular revision using ."
 msgstr "    Nomina una revisione particolare usando ."
 
@@ -7785,12 +8556,17 @@
 "    modificato manualmente se necessario. Il file '.hg/localtags' è\n"
 "    usato per le tag locali (non condivise tra repository)."
 
+msgid ""
+"    Since tag names have priority over branch names during revision\n"
+"    lookup, using an existing branch name as a tag name is discouraged."
+msgstr ""
+
 msgid "tag names must be unique"
 msgstr "i nomi delle tag devono essere univoci"
 
-#, python-format
-msgid "the name '%s' is reserved"
-msgstr "il nome '%s' è riservato"
+#, fuzzy
+msgid "tag names cannot consist entirely of whitespace"
+msgstr "ignora le modifiche nel conteggio degli spazi bianchi"
 
 msgid "--rev and --remove are incompatible"
 msgstr "--rev e --remove sono incompatibili"
@@ -7799,146 +8575,126 @@
 msgid "tag '%s' does not exist"
 msgstr "la tag '%s' non esiste"
 
-#, fuzzy, python-format
+#, python-format
 msgid "tag '%s' is not a global tag"
-msgstr "la tag '%s' non è una tag %s"
+msgstr "la tag '%s' non è una tag globale"
 
-#, fuzzy, python-format
+#, python-format
 msgid "tag '%s' is not a local tag"
-msgstr "la tag '%s' non è una tag %s"
+msgstr "la tag '%s' non è una tag locale"
 
 #, python-format
 msgid "tag '%s' already exists (use -f to force)"
 msgstr "la tag '%s' esiste già (usare -f per forzare)"
 
-#, fuzzy
 msgid "list repository tags"
 msgstr "elenca le tag del repository"
 
-#, fuzzy
 msgid ""
 "    This lists both regular and local tags. When the -v/--verbose\n"
-"    switch is used, a third column \"local\" is printed for local tags.\n"
-"    "
+"    switch is used, a third column \"local\" is printed for local tags."
 msgstr ""
-"    Questo elenca sia le tag regolari sia le tag locali. Quando viene usata l'opzione -v/--verbose\n"
-"    una terza colonna \"local\" viene stampata per le tag locali.\n"
-"    "
+"    Questo elenca sia le tag regolari sia le tag locali. Quando viene usata "
+"l'opzione -v/--verbose\n"
+"    una terza colonna \"local\" viene stampata per le tag locali."
 
-#, fuzzy
 msgid "show the tip revision"
 msgstr "mostra la revisione tip"
 
-#, fuzzy
 msgid ""
 "    The tip revision (usually just called the tip) is the changeset\n"
 "    most recently added to the repository (and therefore the most\n"
 "    recently changed head)."
 msgstr ""
-"    La revisione tip (di solito chiamata solo tip) è il più recente\n"
-"    changeset aggiunto al repository, l'head modificata più\n"
-"    recentemente."
+"    La revisione tip (di solito chiamata solo tip) è il changeset\n"
+"    aggiunto più di recente al repository (e quindi l'head modificata\n"
+"    più recentemente.)"
 
-#, fuzzy
 msgid ""
 "    If you have just made a commit, that commit will be the tip. If\n"
 "    you have just pulled changes from another repository, the tip of\n"
 "    that repository becomes the current tip. The \"tip\" tag is special\n"
-"    and cannot be renamed or assigned to a different changeset.\n"
-"    "
+"    and cannot be renamed or assigned to a different changeset."
 msgstr ""
-"    Se si ha fatto solo un commit, quel commit sarà il tip. Se si ha\n"
+"    Se si è appena fatto un commit, quel commit sarà il tip. Se si ha\n"
 "    appena fatto il pull di modifiche da un altro repository, il tip\n"
 "    di quel repository diventa il tip corrente. La tag \"tip\" tag è\n"
 "    speciale e non può essere rinominata o assegnata ad un changeset\n"
-"    differente.\n"
-"    "
+"    differente."
 
 msgid "apply one or more changegroup files"
 msgstr "applica uno o più file changegroup"
 
 msgid ""
 "    Apply one or more compressed changegroup files generated by the\n"
-"    bundle command.\n"
-"    "
+"    bundle command."
 msgstr ""
 "    Applica uno o più file changegroup compressi generati dal\n"
-"    comando bundle.\n"
+"    comando bundle."
+
+msgid ""
+"    Returns 0 on success, 1 if an update has unresolved files.\n"
 "    "
+msgstr ""
 
-#, fuzzy
-msgid "update working directory"
-msgstr "aggiorna la directory di lavoro"
+msgid "update working directory (or switch revisions)"
+msgstr "aggiorna la directory di lavoro (o passa a un'altra revisione)"
 
-#, fuzzy
 msgid ""
 "    Update the repository's working directory to the specified\n"
-"    revision, or the tip of the current branch if none is specified.\n"
-"    Use null as the revision to remove the working copy (like 'hg\n"
-"    clone -U')."
+"    changeset."
 msgstr ""
-"    Aggiorna la directory di lavoro del repository ad una revisione\n"
-"    specifica, o al tip della branch corrente se nessuna è stata\n"
-"    specificata. Usare null come revisione per rimuovere la copia di\n"
-"    lavoro (come 'hg clone -U')."
 
-#, fuzzy
 msgid ""
-"    When the working directory contains no uncommitted changes, it\n"
-"    will be replaced by the state of the requested revision from the\n"
-"    repository. When the requested revision is on a different branch,\n"
-"    the working directory will additionally be switched to that\n"
-"    branch."
+"    If no changeset is specified, attempt to update to the tip of the\n"
+"    current branch. If this changeset is a descendant of the working\n"
+"    directory's parent, update to it, otherwise abort."
 msgstr ""
-"    Quando la directory di lavoro non contiene modifiche di cui non si\n"
-"    è eseguito il commit, sarà rimpiazzata dallo stato della revisione\n"
-"    richiesta dal repository. Quando la revisione richiesta è su una\n"
-"    branch differente, la directory di lavoro verrà inoltre spostata\n"
-"    su quella branch."
 
-#, fuzzy
 msgid ""
-"    When there are uncommitted changes, use option -C/--clean to\n"
-"    discard them, forcibly replacing the state of the working\n"
-"    directory with the requested revision. Alternately, use -c/--check\n"
-"    to abort."
+"    The following rules apply when the working directory contains\n"
+"    uncommitted changes:"
 msgstr ""
-"    Quandi ci sono modifiche di cui non si è eseguito il commit, usare\n"
-"    l'opzione -C per scartarle, forzando la sostituzione dello stato\n"
-"    della directory di lavoro con la revisione richiesta."
 
-#, fuzzy
 msgid ""
-"    When there are uncommitted changes and option -C/--clean is not\n"
-"    used, and the parent revision and requested revision are on the\n"
-"    same branch, and one of them is an ancestor of the other, then the\n"
-"    new working directory will contain the requested revision merged\n"
-"    with the uncommitted changes. Otherwise, the update will fail with\n"
-"    a suggestion to use 'merge' or 'update -C' instead."
+"    1. If neither -c/--check nor -C/--clean is specified, and if\n"
+"       the requested changeset is an ancestor or descendant of\n"
+"       the working directory's parent, the uncommitted changes\n"
+"       are merged into the requested changeset and the merged\n"
+"       result is left uncommitted. If the requested changeset is\n"
+"       not an ancestor or descendant (that is, it is on another\n"
+"       branch), the update is aborted and the uncommitted changes\n"
+"       are preserved."
+msgstr ""
+
+msgid ""
+"    2. With the -c/--check option, the update is aborted and the\n"
+"       uncommitted changes are preserved."
 msgstr ""
-"    Quando ci sono modifiche di cui non si è eseguito il commit,\n"
-"    l'opzione -C non è usata, la revisione del genitore e di quella\n"
-"    richiesta sono sulla stessa branch e una di queste è un antenato\n"
-"    dell'altro, allora la nuova directory di lavoro conterrà la\n"
-"    revisione richiesta unita con le modifiche non salvate. Altrimenti\n"
-"    l'aggiornamento fallirà con un suggerimento di usare invece\n"
-"    'merge' o 'update -C'."
 
-#, fuzzy
 msgid ""
-"    If you want to update just one file to an older revision, use\n"
-"    revert."
+"    3. With the -C/--clean option, uncommitted changes are discarded and\n"
+"       the working directory is updated to the requested changeset."
+msgstr ""
+
+msgid ""
+"    Use null as the changeset to remove the working directory (like\n"
+"    :hg:`clone -U`)."
+msgstr ""
+
+msgid ""
+"    If you want to update just one file to an older changeset, use :hg:"
+"`revert`."
 msgstr ""
 "    Se si desidera aggiornare solo un file ad una revisione più\n"
-"    vecchia, usare revert."
+"    vecchia, usare :hg: `revert`."
 
-#, fuzzy
 msgid "cannot specify both -c/--check and -C/--clean"
-msgstr "non è possibile specificare sia una revisione sia una base"
+msgstr "non è possibile specificare sia -c/--check sia -C/--clean"
 
 #, fuzzy
 msgid "uncommitted local changes"
-msgstr "sovrascrivi ogni modifica locale"
+msgstr "modifiche locale sovrascrivi ogni "
 
 msgid "verify the integrity of the repository"
 msgstr "verifica l'integrità del repository"
@@ -7946,12 +8702,12 @@
 msgid "    Verify the integrity of the current repository."
 msgstr "    Verifica l'integrità del repository corrente."
 
+#, fuzzy
 msgid ""
 "    This will perform an extensive check of the repository's\n"
 "    integrity, validating the hashes and checksums of each entry in\n"
 "    the changelog, manifest, and tracked files, as well as the\n"
-"    integrity of their crosslinks and indices.\n"
-"    "
+"    integrity of their crosslinks and indices."
 msgstr ""
 "    Questo comando eseguirà un controllo estensivo dell'integrità del\n"
 "    repository validando gli hash e i checksum di ogni voce nel\n"
@@ -7982,6 +8738,9 @@
 msgid "repository root directory or name of overlay bundle file"
 msgstr "directory radice del repository o nome del percorso simbolico"
 
+msgid "DIR"
+msgstr ""
+
 msgid "change working directory"
 msgstr "cambia la directory di lavoro"
 
@@ -7994,9 +8753,13 @@
 msgid "enable additional output"
 msgstr "abilita output aggiuntivo"
 
-msgid "set/override config option"
+#, fuzzy
+msgid "set/override config option (use 'section.name=value')"
 msgstr "imposta/sovrascrive l'opzione di configurazione"
 
+msgid "CONFIG"
+msgstr ""
+
 msgid "enable debugging output"
 msgstr "abilita output di debug"
 
@@ -8006,10 +8769,17 @@
 msgid "set the charset encoding"
 msgstr "imposta la codifica dei caratteri"
 
+msgid "ENCODE"
+msgstr ""
+
+msgid "MODE"
+msgstr ""
+
 msgid "set the charset encoding mode"
 msgstr "imposta la modalità di codifica dei caratteri"
 
-msgid "print traceback on exception"
+#, fuzzy
+msgid "always print a traceback on exception"
 msgstr "stampa un traceback in seguito ad eccezioni"
 
 msgid "time how long the command takes"
@@ -8033,16 +8803,21 @@
 msgid "specify hg command to run on the remote side"
 msgstr "specifica il comando hg da eseguire in remoto"
 
+msgid "PATTERN"
+msgstr ""
+
 msgid "include names matching the given patterns"
 msgstr "include nomi che corrispondono ai pattern dati"
 
 msgid "exclude names matching the given patterns"
 msgstr "esclude nomi che corrispondono ai pattern dati"
 
-msgid "use  as commit message"
+#, fuzzy
+msgid "use text as commit message"
 msgstr "usa  come messaggio di commit"
 
-msgid "read commit message from "
+#, fuzzy
+msgid "read commit message from file"
 msgstr "legge il messaggio di commit da "
 
 msgid "record datecode as commit date"
@@ -8052,6 +8827,9 @@
 msgid "record the specified user as committer"
 msgstr "registra l'utente come committente"
 
+msgid "STYLE"
+msgstr ""
+
 msgid "display using template map file"
 msgstr "mostra usando un file mappa template"
 
@@ -8061,15 +8839,22 @@
 msgid "do not show merges"
 msgstr "non mostrare i merge"
 
+msgid "output diffstat-style summary of changes"
+msgstr ""
+
 msgid "treat all files as text"
 msgstr "tratta tutti i file come testo"
 
-msgid "don't include dates in diff headers"
+#, fuzzy
+msgid "omit dates from diff headers"
 msgstr "non includere le date nelle intestazioni dei diff"
 
 msgid "show which function each change is in"
 msgstr "mostra in quale funzione si trova ogni modifica"
 
+msgid "produce a diff that undoes the changes"
+msgstr ""
+
 msgid "ignore white space when comparing lines"
 msgstr "ignora spazi bianchi quando si confrontano righe"
 
@@ -8082,21 +8867,32 @@
 msgid "number of lines of context to show"
 msgstr "numero di righe di contesto da mostrare"
 
+msgid "SIMILARITY"
+msgstr ""
+
 msgid "guess renamed files by similarity (0<=s<=100)"
 msgstr "stima i file rinominati per similarità (0<=s<=100)"
 
 msgid "[OPTION]... [FILE]..."
-msgstr "[OPZIONI]... [FILE]..."
+msgstr "[OPZIONE]... [FILE]..."
 
 msgid "annotate the specified revision"
 msgstr "annota la revisione specificata"
 
-msgid "follow file copies and renames"
+msgid "follow copies/renames and list the filename (DEPRECATED)"
+msgstr ""
+
+#, fuzzy
+msgid "don't follow copies and renames"
 msgstr "segue le copie e le rinomine dei file"
 
 msgid "list the author (long with -v)"
 msgstr "elenca l'autore (verboso con -v)"
 
+#, fuzzy
+msgid "list the filename"
+msgstr "elenca il changeset"
+
 msgid "list the date (short with -q)"
 msgstr "elenca la data (breve con -q)"
 
@@ -8115,6 +8911,9 @@
 msgid "do not pass files through decoders"
 msgstr "non passare file attraverso decodificatori"
 
+msgid "PREFIX"
+msgstr ""
+
 msgid "directory prefix for files in archive"
 msgstr "prefisso di directory per i file nell'archivio"
 
@@ -8125,7 +8924,7 @@
 msgstr "tipo di distribuzione da creare"
 
 msgid "[OPTION]... DEST"
-msgstr "[OPZIONI]... DEST"
+msgstr "[OPZIONE]... DEST"
 
 msgid "merge with old dirstate parent after backout"
 msgstr "effettua il merge con il vecchio dirstate del genitore dopo il backout"
@@ -8137,7 +8936,7 @@
 msgstr "revisione di cui effettuare il backout"
 
 msgid "[OPTION]... [-r] REV"
-msgstr "[OPZIONI]... [-r] REV"
+msgstr "[OPZIONE]... [-r] REV"
 
 msgid "reset bisect state"
 msgstr "resetta lo stato di bisect"
@@ -8157,7 +8956,8 @@
 msgid "do not update to target"
 msgstr "non aggiornare a target"
 
-msgid "[-gbsr] [-c CMD] [REV]"
+#, fuzzy
+msgid "[-gbsr] [-U] [-c CMD] [REV]"
 msgstr "[-gbsr] [-c CMD] [REV]"
 
 msgid "set branch name even if it shadows an existing branch"
@@ -8170,21 +8970,30 @@
 msgstr "[-fC] [NOME]"
 
 msgid "show only branches that have unmerged heads"
-msgstr "mostra solo le branch che hanno head di cui non si è effettuato il merge"
+msgstr ""
+"mostra solo le branch che hanno head di cui non si è effettuato il merge"
 
 msgid "show normal and closed branches"
 msgstr ""
 
-msgid "[-a]"
+#, fuzzy
+msgid "[-ac]"
 msgstr "[-a]"
 
-msgid "run even when remote repository is unrelated"
+#, fuzzy
+msgid "run even when the destination is unrelated"
 msgstr "esegui anche quando il repository remoto non è collegato"
 
-msgid "a changeset up to which you would like to bundle"
-msgstr "un changeset fino al quale si desidera effettuare il bundle"
+#, fuzzy
+msgid "a changeset intended to be added to the destination"
+msgstr "un changeset base da specificare invece di una destinazione"
+
+#, fuzzy
+msgid "a specific branch you would like to bundle"
+msgstr "una specifica revisione di cui si desidera fare il pull"
 
-msgid "a base changeset to specify instead of a destination"
+#, fuzzy
+msgid "a base changeset assumed to be available at the destination"
 msgstr "un changeset base da specificare invece di una destinazione"
 
 msgid "bundle all changesets in the repository"
@@ -8193,7 +9002,8 @@
 msgid "bundle compression type to use"
 msgstr "tipo di compressione da usare per il bundle"
 
-msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
+#, fuzzy
+msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
 msgstr "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
 
 msgid "print output to file with formatted name"
@@ -8206,19 +9016,30 @@
 msgstr "applica qualunque filtro di decodifica corrispondente"
 
 msgid "[OPTION]... FILE..."
-msgstr "[OPZIONI]... FILE..."
+msgstr "[OPZIONE]... FILE..."
 
-msgid "the clone will only contain a repository (no working copy)"
+#, fuzzy
+msgid "the clone will include an empty working copy (only a repository)"
 msgstr "il clone conterrà solo un repository (nessuna copia di lavoro)"
 
-msgid "a changeset you would like to have after cloning"
-msgstr "un changeset che si desidera avere dopo il clone"
+#, fuzzy
+msgid "revision, tag or branch to check out"
+msgstr "revisione di cui effettuare il backout"
+
+#, fuzzy
+msgid "include the specified changeset"
+msgstr "collassa le revisioni di cui si effettua il rebase"
+
+#, fuzzy
+msgid "clone only the specified branch"
+msgstr "restituisce solo le modifiche relative alle branch specificate"
 
 msgid "[OPTION]... SOURCE [DEST]"
-msgstr "[OPZIONI]... SORGENTE [DEST]"
+msgstr "[OPZIONE]... SORGENTE [DEST]"
 
 msgid "mark new/missing files as added/removed before committing"
-msgstr "marca file nuovi/mancanti come aggiunti/rimossi prima di effettuare il commit"
+msgstr ""
+"marca file nuovi/mancanti come aggiunti/rimossi prima di effettuare il commit"
 
 msgid "mark a branch as closed, hiding it from the branch list"
 msgstr "marca una branch come chiusa, nascondendola dall'elenco delle branch"
@@ -8235,6 +9056,22 @@
 msgid "[INDEX] REV1 REV2"
 msgstr "[INDICE] REV1 REV2"
 
+#, fuzzy
+msgid "add single file mergeable changes"
+msgstr "sto aggiungendo le modifiche ai file\n"
+
+msgid "add single file all revs append to"
+msgstr ""
+
+msgid "add single file all revs overwrite"
+msgstr ""
+
+msgid "add new file at each rev"
+msgstr ""
+
+msgid "[OPTION]... TEXT"
+msgstr "[OPZIONE]... TESTO"
+
 msgid "[COMMAND]"
 msgstr "[COMANDO]"
 
@@ -8244,6 +9081,23 @@
 msgid "[-o] CMD"
 msgstr "[-o] CMD"
 
+msgid "use tags as labels"
+msgstr ""
+
+#, fuzzy
+msgid "annotate with branch names"
+msgstr "mantiene le branch originali"
+
+#, fuzzy
+msgid "use dots for runs"
+msgstr "stile non trovato: %s"
+
+msgid "separate elements by spaces"
+msgstr ""
+
+msgid "[OPTION]... [FILE [REV]...]"
+msgstr "[OPZIONE]... [FILE [REV]...]"
+
 msgid "try extended date formats"
 msgstr "prova formati di date estesi"
 
@@ -8256,8 +9110,8 @@
 msgid "[PATH]"
 msgstr "[PERCORSO]"
 
-msgid "FILE"
-msgstr "FILE"
+msgid "REPO NAMESPACE [KEY OLD NEW]"
+msgstr ""
 
 msgid "revision to rebuild to"
 msgstr "revisione alla quale ricostruire"
@@ -8278,20 +9132,24 @@
 msgstr "non mostrare l'mtime salvato"
 
 msgid "[OPTION]..."
-msgstr "[OPZIONI]..."
+msgstr "[OPZIONE]..."
 
 #, fuzzy
 msgid "revision to check"
 msgstr "revisione di cui effettuare il backout"
 
-msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
-msgstr "[OPZIONI]... [-r REV1 [-r REV2]] [FILE]..."
+msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
+msgstr "[OPZIONE]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
 
 msgid "diff against the second parent"
 msgstr "effettua il diff con il secondo genitore"
 
+#, fuzzy
+msgid "revisions to export"
+msgstr "revisione di cui fare il merge"
+
 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
-msgstr "[OPZIONI]... [-o OUTFILESPEC] REV..."
+msgstr "[OPZIONE]... [-o OUTFILESPEC] REV..."
 
 msgid "end fields with NUL"
 msgstr "termina i campi con NUL"
@@ -8300,7 +9158,9 @@
 msgstr "stampa tutte le revisioni che corrispondono"
 
 msgid "follow changeset history, or file history across copies and renames"
-msgstr "segue la storia del changeset, o la storia del file attraverso copie e rinomine"
+msgstr ""
+"segue la storia del changeset, o la storia del file attraverso copie e "
+"rinomine"
 
 msgid "ignore case when matching"
 msgstr "ignora il case quando si cercano corrispondenze"
@@ -8312,26 +9172,29 @@
 msgid "print matching line numbers"
 msgstr "stampa i numeri di riga corrispondenti"
 
-msgid "search in given revision range"
+#, fuzzy
+msgid "only search files changed within revision range"
 msgstr "cerca nell'intervallo di revisioni fornito"
 
 msgid "[OPTION]... PATTERN [FILE]..."
-msgstr "[OPZIONI]... PATTERN [FILE]..."
+msgstr "[OPZIONE]... PATTERN [FILE]..."
 
 #, fuzzy
 msgid "show only heads which are descendants of REV"
 msgstr "mostra solo le head che sono discendenti della revisione"
 
-#, fuzzy
-msgid "show only the active branch heads from open branches"
-msgstr "mostra solo le head attive dalle branch aperte"
+msgid "show topological heads only"
+msgstr ""
+
+msgid "show active branchheads only [DEPRECATED]"
+msgstr ""
 
 msgid "show normal and closed branch heads"
 msgstr ""
 
 #, fuzzy
-msgid "[-r STARTREV] [REV]..."
-msgstr "[-r REV] [REV]..."
+msgid "[-ac] [-r REV] [REV]..."
+msgstr "[-r REV] [REV]"
 
 msgid "[TOPIC]"
 msgstr "[ARGOMENTO]"
@@ -8356,16 +9219,23 @@
 msgstr "[-nibt] [-r REV] [SORGENTE]"
 
 #, fuzzy
-msgid "directory strip option for patch. This has the same meaning as the corresponding patch option"
+msgid ""
+"directory strip option for patch. This has the same meaning as the "
+"corresponding patch option"
 msgstr ""
 "opzione di rimozione della directory per patch. Questa ha lo stesso\n"
 "significato dell'opzione corrispondente di patch"
 
+#, fuzzy
+msgid "PATH"
+msgstr "[PERCORSO]"
+
 msgid "base path"
 msgstr "percorso base"
 
 msgid "skip check for outstanding uncommitted changes"
-msgstr "salta il controllo di modifiche pendenti di cui non si è effettuato il commit"
+msgstr ""
+"salta il controllo di modifiche pendenti di cui non si è effettuato il commit"
 
 msgid "don't commit, just update the working directory"
 msgstr "non effettuare il commit, aggiorna solo la directory di lavoro"
@@ -8375,10 +9245,15 @@
 
 #, fuzzy
 msgid "use any branch information in patch (implied by --exact)"
-msgstr "Usa qualunque informazione sulla branch nella patch (implicato da --exact)"
+msgstr ""
+"Usa qualunque informazione sulla branch nella patch (implicato da --exact)"
 
 msgid "[OPTION]... PATCH..."
-msgstr "[OPZIONI]... PATCH..."
+msgstr "[OPZIONE]... PATCH..."
+
+#, fuzzy
+msgid "run even if remote repository is unrelated"
+msgstr "esegui anche quando il repository remoto non è collegato"
 
 msgid "show newest record first"
 msgstr "mostra prima il record più nuovo"
@@ -8386,8 +9261,13 @@
 msgid "file to store the bundles into"
 msgstr "file in cui salvare i bundle"
 
-msgid "a specific revision up to which you would like to pull"
-msgstr "una specifica revisione fino alla quale si desidera fare il pull"
+#, fuzzy
+msgid "a remote changeset intended to be added"
+msgstr "mostra il changeset corrente nei rami degli antenati"
+
+#, fuzzy
+msgid "a specific branch you would like to pull"
+msgstr "una specifica revisione di cui si desidera fare il pull"
 
 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
 msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle NOME_FILE] [SORGENTE]"
@@ -8396,7 +9276,7 @@
 msgstr "[-e CMD] [--remotecmd CMD] [DEST]"
 
 #, fuzzy
-msgid "search the repository as it stood at REV"
+msgid "search the repository as it is in REV"
 msgstr "cerca nel repository per come era alla revisione rev"
 
 msgid "end filenames with NUL, for use with xargs"
@@ -8406,7 +9286,7 @@
 msgstr "stampa i percorsi completi dalla radice del filesystem"
 
 msgid "[OPTION]... [PATTERN]..."
-msgstr "[OPZIONI]... [PATTERN]..."
+msgstr "[OPZIONE]... [PATTERN]..."
 
 msgid "only follow the first parent of merge changesets"
 msgstr "segui solo il primo genitore di un changeset di merge"
@@ -8418,7 +9298,8 @@
 msgid "show copied files"
 msgstr "mostra i file copiati"
 
-msgid "do case-insensitive search for a keyword"
+#, fuzzy
+msgid "do case-insensitive search for a given text"
 msgstr "effettua una ricerca case-insensitive di una parola chiave"
 
 #, fuzzy
@@ -8432,14 +9313,19 @@
 msgid "revisions committed by user"
 msgstr "commit delle revisioni effettuato dall'utente"
 
-msgid "show only changesets within the given named branch"
+#, fuzzy
+msgid "show only changesets within the given named branch (DEPRECATED)"
+msgstr "mostra solo i changeset all'interno della data named branch"
+
+#, fuzzy
+msgid "show changesets within the given named branch"
 msgstr "mostra solo i changeset all'interno della data named branch"
 
 msgid "do not display revision or any of its ancestors"
 msgstr "non mostrare la revisione o qualche suo antenato"
 
 msgid "[OPTION]... [FILE]"
-msgstr "[OPZIONI]... [FILE]"
+msgstr "[OPZIONE]... [FILE]"
 
 msgid "revision to display"
 msgstr "revisione da mostrare"
@@ -8456,17 +9342,23 @@
 msgid "review revisions to merge (no merge is performed)"
 msgstr ""
 
-msgid "[-f] [[-r] REV]"
+#, fuzzy
+msgid "[-P] [-f] [[-r] REV]"
 msgstr "[-f] [[-r] REV]"
 
-msgid "a specific revision up to which you would like to push"
-msgstr "una specifica revisione fino alla quale si desidera effettuare il push"
-
+#, fuzzy
+msgid "a changeset intended to be included in the destination"
+msgstr "mostra changeset non trovati nella destinazione"
+
+#, fuzzy
+msgid "a specific branch you would like to push"
+msgstr "una specifica revisione di cui si desidera fare il pull"
+
 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
 msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
 
 #, fuzzy
-msgid "show parents from the specified revision"
+msgid "show parents of the specified revision"
 msgstr "mostra i genitori della revisione specificata"
 
 #, fuzzy
@@ -8476,15 +9368,22 @@
 msgid "[NAME]"
 msgstr "[NOME]"
 
-msgid "update to new tip if changesets were pulled"
+#, fuzzy
+msgid "update to new branch head if changesets were pulled"
 msgstr "aggiorna alla nuova tip se si è effettuato il pull di changeset"
 
+msgid "run even when remote repository is unrelated"
+msgstr "esegui anche quando il repository remoto non è collegato"
+
 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
 msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SORGENTE]"
 
 msgid "force push"
 msgstr "forza il push"
 
+msgid "allow pushing a new branch"
+msgstr ""
+
 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
 msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
 
@@ -8498,9 +9397,10 @@
 msgstr "registra una rinomina che si è già verificata"
 
 msgid "[OPTION]... SOURCE... DEST"
-msgstr "[OPZIONI]... SORGENTE... DEST"
+msgstr "[OPZIONE]... SORGENTE... DEST"
 
-msgid "remerge all unresolved files"
+#, fuzzy
+msgid "select all unresolved files"
 msgstr "rieffettua il merge di tutti i file non risolti"
 
 msgid "list state of files needing merge"
@@ -8512,20 +9412,24 @@
 msgid "unmark files as resolved"
 msgstr "smarca i file come risolti"
 
+msgid "hide status prefix"
+msgstr "nascondi il prefisso di stato"
+
 msgid "revert all changes when no arguments given"
 msgstr "annulla tutte le modifiche quando nessun argomento è stato fornito"
 
 msgid "tipmost revision matching date"
 msgstr "la revisione più vicina a tip corrispondente alla data"
 
-msgid "revision to revert to"
-msgstr "revisione a cui annullare"
+#, fuzzy
+msgid "revert to the specified revision"
+msgstr "ritorna alla revisione specificata"
 
 msgid "do not save backup copies of files"
 msgstr "non salva copie di backup dei file"
 
 msgid "[OPTION]... [-r REV] [NAME]..."
-msgstr "[OPZIONI]... [-r REV] [NOME]..."
+msgstr "[OPZIONE]... [-r REV] [NOME]..."
 
 msgid "name of access log file to write to"
 msgstr "nome del file di log degli accessi su cui scrivere"
@@ -8533,9 +9437,15 @@
 msgid "name of error log file to write to"
 msgstr "nome del file di log degli errori su cui scrivere"
 
+msgid "PORT"
+msgstr ""
+
 msgid "port to listen on (default: 8000)"
 msgstr "porta su cui stare in ascolto (default: 8000)"
 
+msgid "ADDR"
+msgstr ""
+
 msgid "address to listen on (default: all interfaces)"
 msgstr "indirizzo su cui stare in ascolto (default: tutte le interfacce)"
 
@@ -8547,9 +9457,12 @@
 msgstr "nome da mostrare nelle pagine web (default: la directory di lavoro)"
 
 #, fuzzy
-msgid "name of the webdir config file (serve more than one repository)"
+msgid "name of the hgweb config file (serve more than one repository)"
 msgstr "nome del file di configurazione webdir (serve più di un repository)"
 
+msgid "name of the hgweb config file (DEPRECATED)"
+msgstr ""
+
 msgid "for remote clients"
 msgstr "per i client remoti"
 
@@ -8598,15 +9511,16 @@
 msgid "show only ignored files"
 msgstr "mostra solo i file ignorati"
 
-msgid "hide status prefix"
-msgstr "nascondi lo stato del prefisso"
-
 msgid "show source of copied files"
 msgstr "mostra la sorgente dei file copiati"
 
 msgid "show difference from revision"
 msgstr "mostra le differenze dalla revisione"
 
+#, fuzzy
+msgid "list the changed files of a revision"
+msgstr "è necessario avere almeno alcune revisioni"
+
 msgid "replace existing tag"
 msgstr "rimpiazza tag esistente"
 
@@ -8619,31 +9533,40 @@
 msgid "remove a tag"
 msgstr "rimuove una tag"
 
-msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
+msgid "use  as commit message"
+msgstr "usa  come messaggio di commit"
+
+#, fuzzy
+msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
 msgstr "[-l] [-m TESTO] [-d DATA] [-u UTENTE] [-r REV] NOME..."
 
-msgid "[-p]"
+#, fuzzy
+msgid "[-p] [-g]"
 msgstr "[-p]"
 
-msgid "update to new tip if changesets were unbundled"
+#, fuzzy
+msgid "update to new branch head if changesets were unbundled"
 msgstr "aggiorna alla nuova tip se changeset sono stati estratti da un bundle"
 
 msgid "[-u] FILE..."
 msgstr "[-u] FILE..."
 
-msgid "overwrite locally modified files (no backup)"
-msgstr "sovrascrivi file modificati localmente (nessun backup)"
+#, fuzzy
+msgid "discard uncommitted changes (no backup)"
+msgstr "importa nella patch le modifiche di cui non si è effettuato il commit"
 
 #, fuzzy
 msgid "check for uncommitted changes"
-msgstr "salta il controllo di modifiche pendenti di cui non si è effettuato il commit"
+msgstr ""
+"salta il controllo di modifiche pendenti di cui non si è effettuato il commit"
 
-msgid "[-C] [-d DATE] [[-r] REV]"
+#, fuzzy
+msgid "[-c] [-C] [-d DATE] [[-r] REV]"
 msgstr "[-C] [-d DATA] [[-r] REV]"
 
 #, fuzzy, python-format
-msgid "config error at %s:%d: '%s'"
-msgstr "impossibile avviare il server a '%s:%d': %s"
+msgid "cannot include %s (%s)"
+msgstr "impossibile fare push di '%s' - %s\n"
 
 msgid "not found in manifest"
 msgstr "non trovato nel manifesto"
@@ -8651,9 +9574,51 @@
 msgid "branch name not in UTF-8!"
 msgstr "il nome della branch non è in UTF-8!"
 
-#, fuzzy
+#, python-format
+msgid "%s does not exist!\n"
+msgstr "%s non esiste!\n"
+
+#, python-format
+msgid ""
+"%s: up to %d MB of RAM may be required to manage this file\n"
+"(use 'hg revert %s' to cancel the pending addition)\n"
+msgstr ""
+
+#, python-format
+msgid "%s not added: only files and symlinks supported currently\n"
+msgstr ""
+"%s non aggiunto: attualmente solo file e link simbolici sono supportati\n"
+
+#, python-format
+msgid "%s already tracked!\n"
+msgstr "%s è già tracciato!\n"
+
+#, python-format
+msgid "%s not added!\n"
+msgstr "%s non aggiunto!\n"
+
+#, python-format
+msgid "%s still exists!\n"
+msgstr ""
+
+#, python-format
+msgid "%s not tracked!\n"
+msgstr "%s non è tracciato!\n"
+
+#, python-format
+msgid "%s not removed!\n"
+msgstr ""
+
+#, python-format
+msgid "copy failed: %s is not a file or a symbolic link\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "invalid event type in dag: %s"
+msgstr "voce non valida in fncache, linea %s"
+
 msgid "working directory state appears damaged!"
-msgstr "(directory di lavoro non  tip)\n"
+msgstr "lo stato della directory di lavoro risulta danneggiato!"
 
 #, python-format
 msgid "'\\n' and '\\r' disallowed in filenames: %r"
@@ -8668,12 +9633,15 @@
 msgstr "il file %r nel dirstate collide con %r"
 
 #, python-format
+msgid "setting %r to other parent only allowed in merges"
+msgstr ""
+
+#, python-format
 msgid "not in dirstate: %s\n"
 msgstr "non nel dirstate: %s\n"
 
-#, fuzzy
 msgid "unknown"
-msgstr "base sconosciuta"
+msgstr "sconosciuto"
 
 msgid "character device"
 msgstr "device a caratteri"
@@ -8690,17 +9658,64 @@
 msgid "directory"
 msgstr "directory"
 
-#, fuzzy, python-format
+#, python-format
 msgid "unsupported file type (type is %s)"
-msgstr "%s: tipo di file non supportato (il tipo è %s)\n"
+msgstr "tipo di file non supportato (il tipo è %s)"
+
+msgid "queries"
+msgstr ""
+
+#, fuzzy
+msgid "searching"
+msgstr "ricerca"
+
+msgid "already have changeset "
+msgstr ""
+
+msgid "warning: repository is unrelated\n"
+msgstr ""
+
+msgid "repository is unrelated"
+msgstr "il repository non è imparentato"
+
+#, fuzzy, python-format
+msgid "abort: push creates new remote heads on branch '%s'!\n"
+msgstr "abortito: push crea un nuovo branch remoto '%s'!\n"
+
+msgid "abort: push creates new remote heads!\n"
+msgstr "abortito: push crea nuove head remote!\n"
+
+#, fuzzy
+msgid "(you should pull and merge or use push -f to force)\n"
+msgstr ""
+"(ti sei dimenticato di effettuare il merge? usare push -f per forzare)\n"
+
+msgid "(did you forget to merge? use push -f to force)\n"
+msgstr ""
+"(ti sei dimenticato di effettuare il merge? usare push -f per forzare)\n"
+
+#, fuzzy, python-format
+msgid "abort: push creates new remote branches: %s!\n"
+msgstr "abortito: push crea un nuovo branch remoto '%s'!\n"
+
+#, fuzzy
+msgid "(use 'hg push --new-branch' to create new remote branches)\n"
+msgstr "abortito: push crea un nuovo branch remoto '%s'!\n"
+
+msgid "note: unsynced remote changes!\n"
+msgstr "nota: modifiche remote non sincronizzate!\n"
 
 #, python-format
 msgid "abort: %s\n"
 msgstr "abortito: %s\n"
 
-#, python-format
-msgid "hg: %s\n"
-msgstr "hg: %s\n"
+#, fuzzy, python-format
+msgid "hg: parse error at %s: %s\n"
+msgstr "impossibile avviare il server a '%s:%d': %s"
+
+#, fuzzy, python-format
+msgid "hg: parse error: %s\n"
+msgstr "abortito: errore: %s\n"
 
 #, python-format
 msgid ""
@@ -8731,6 +9746,10 @@
 msgstr "hg %s: %s\n"
 
 #, python-format
+msgid "hg: %s\n"
+msgstr "hg: %s\n"
+
+#, python-format
 msgid "abort: %s!\n"
 msgstr "abortito: %s!\n"
 
@@ -8748,10 +9767,6 @@
 msgid "hg: unknown command '%s'\n"
 msgstr "hg: comando '%s' sconosciuto\n"
 
-#, python-format
-msgid "abort: could not import module %s!\n"
-msgstr "abortito: non è stato possibile importare %s!\n"
-
 msgid "(did you forget to compile extensions?)\n"
 msgstr "(ti sei dimenticato di compilare le estensioni?)\n"
 
@@ -8781,14 +9796,18 @@
 msgid "** unknown exception encountered, details follow\n"
 msgstr "** incontrata eccezione sconosciuta, seguono dettagli\n"
 
-#, fuzzy
 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
-msgstr "** riportare dettagli del bug a http://www.selenic.com/mercurial/bts\n"
+msgstr ""
+"** riportare dettagli del bug a http://www.selenic.com/mercurial/bts/\n"
 
 msgid "** or mercurial@selenic.com\n"
 msgstr "** o mercurial@selenic.com\n"
 
 #, python-format
+msgid "** Python %s\n"
+msgstr ""
+
+#, python-format
 msgid "** Mercurial Distributed SCM (version %s)\n"
 msgstr "** Mercurial SCM Distribuito (versione %s)\n"
 
@@ -8800,18 +9819,22 @@
 msgid "no definition for alias '%s'\n"
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "alias '%s' resolves to unknown command '%s'\n"
-msgstr "la tag '%s' si riferisce ad un nodo sconosciuto"
+msgstr "l'alias '%s' corrisponde al comando sconosciuto '%s'\n"
 
 #, python-format
 msgid "alias '%s' resolves to ambiguous command '%s'\n"
-msgstr ""
+msgstr "l'alias '%s' corrisponde al comando ambiguo '%s'\n"
 
-#, python-format
-msgid "malformed --config option: %s"
+#, fuzzy, python-format
+msgid "malformed --config option: %r (use --config section.name=value)"
 msgstr "opzione --config malformata: %s"
 
+#, fuzzy, python-format
+msgid "error getting current working directory: %s"
+msgstr "stampa la radice (top) della directory di lavoro corrente"
+
 #, python-format
 msgid "extension '%s' overrides commands: %s\n"
 msgstr "l'estensione '%s' rimpiazza i comandi: %s\n"
@@ -8822,137 +9845,1810 @@
 msgid "Option --cwd may not be abbreviated!"
 msgstr "Non si può abbreviare l'opzione --cwd!"
 
-msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!"
+msgid ""
+"Option -R has to be separated from other options (e.g. not -qR) and --"
+"repository may only be abbreviated as --repo!"
 msgstr ""
 
 #, python-format
 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
 msgstr ""
 
-#, python-format
-msgid "repository '%s' is not local"
-msgstr "il repository '%s' non è locale"
-
-msgid "invalid arguments"
-msgstr "argomenti non validi"
+#, python-format
+msgid "repository '%s' is not local"
+msgstr "il repository '%s' non è locale"
+
+#, fuzzy
+msgid "warning: --repository ignored\n"
+msgstr "il repository non è imparentato"
+
+msgid "invalid arguments"
+msgstr "argomenti non validi"
+
+#, python-format
+msgid "unrecognized profiling format '%s' - Ignored\n"
+msgstr ""
+
+msgid ""
+"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
+"misc/lsprof/"
+msgstr ""
+
+#, python-format
+msgid "*** failed to import extension %s from %s: %s\n"
+msgstr "*** fallita l'importazione dell'estensione %s da %s: %s\n"
+
+#, python-format
+msgid "*** failed to import extension %s: %s\n"
+msgstr "*** fallita l'importazione dell'estensione %s: %s\n"
+
+#, python-format
+msgid "couldn't find merge tool %s\n"
+msgstr "non è stato possibile trovare il tool per il merge %s\n"
+
+#, python-format
+msgid "tool %s can't handle symlinks\n"
+msgstr "il tool %s non può gestire link simbolici\n"
+
+#, python-format
+msgid "tool %s can't handle binary\n"
+msgstr "il tool %s non può gestire file binari\n"
+
+#, python-format
+msgid "tool %s requires a GUI\n"
+msgstr "il tool %s richiede una GUI\n"
+
+#, python-format
+msgid ""
+" no tool found to merge %s\n"
+"keep (l)ocal or take (o)ther?"
+msgstr ""
+
+msgid "&Local"
+msgstr ""
+
+msgid "&Other"
+msgstr ""
+
+#, python-format
+msgid "merging %s and %s to %s\n"
+msgstr "sto effettuando il merge di %s e %s in %s\n"
+
+#, python-format
+msgid "merging %s\n"
+msgstr "sto effettuando il merge di %s\n"
+
+#, python-format
+msgid "%s.premerge not valid ('%s' is neither boolean nor %s)"
+msgstr ""
+
+#, python-format
+msgid "was merge of '%s' successful (yn)?"
+msgstr ""
+
+msgid "&No"
+msgstr ""
+
+msgid "&Yes"
+msgstr ""
+
+#, python-format
+msgid ""
+" output file %s appears unchanged\n"
+"was merge successful (yn)?"
+msgstr ""
+
+#, python-format
+msgid "merging %s failed!\n"
+msgstr "merge di %s fallito!\n"
+
+#, python-format
+msgid "Inconsistent state, %s:%s is good and bad"
+msgstr "Stato inconsistente, %s:%s è buona e cattiva"
+
+#, python-format
+msgid "unknown bisect kind %s"
+msgstr ""
+
+msgid "disabled extensions:"
+msgstr "estensioni disabilitate:"
+
+msgid "Configuration Files"
+msgstr ""
+
+msgid "Date Formats"
+msgstr "Formati della data"
+
+msgid "File Name Patterns"
+msgstr "Pattern dei Nomi dei File"
+
+msgid "Environment Variables"
+msgstr "Variabili d'ambiente"
+
+msgid "Specifying Single Revisions"
+msgstr ""
+
+msgid "Specifying Multiple Revisions"
+msgstr "Specificare Revisioni Multiple"
+
+#, fuzzy
+msgid "Specifying Revision Sets"
+msgstr "Specificare Revisioni Multiple"
+
+msgid "Diff Formats"
+msgstr "Formati di diff"
+
+msgid "Template Usage"
+msgstr ""
+
+msgid "URL Paths"
+msgstr "Percorsi URL"
+
+msgid "Using additional features"
+msgstr "Uso di funzionalità aggiuntive"
+
+msgid "Configuring hgweb"
+msgstr ""
+
+msgid "Glossary"
+msgstr ""
+
+msgid ""
+"Mercurial reads configuration data from several files, if they exist.\n"
+"Below we list the most specific file first."
+msgstr ""
+
+msgid "On Windows, these configuration files are read:"
+msgstr ""
+
+msgid ""
+"- ``\\.hg\\hgrc``\n"
+"- ``%USERPROFILE%\\.hgrc``\n"
+"- ``%USERPROFILE%\\mercurial.ini``\n"
+"- ``%HOME%\\.hgrc``\n"
+"- ``%HOME%\\mercurial.ini``\n"
+"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial."
+"ini found)\n"
+"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial."
+"ini found)\n"
+"- ``\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n"
+"- ``\\mercurial.ini``"
+msgstr ""
+
+msgid "On Unix, these files are read:"
+msgstr ""
+
+msgid ""
+"- ``/.hg/hgrc``\n"
+"- ``$HOME/.hgrc``\n"
+"- ``/etc/mercurial/hgrc``\n"
+"- ``/etc/mercurial/hgrc.d/*.rc``\n"
+"- ``/etc/mercurial/hgrc``\n"
+"- ``/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+
+msgid ""
+"If there is a per-repository configuration file which is not owned by\n"
+"the active user, Mercurial will warn you that the file is skipped::"
+msgstr ""
+
+msgid ""
+"  not trusting file /.hg/hgrc from untrusted user USER, group GROUP"
+msgstr ""
+
+msgid ""
+"If this bothers you, the warning can be silenced (the file would still\n"
+"be ignored) or trust can be established. Use one of the following\n"
+"settings, the syntax is explained below:"
+msgstr ""
+
+msgid ""
+"- ``ui.report_untrusted = False``\n"
+"- ``trusted.users = USER``\n"
+"- ``trusted.groups = GROUP``"
+msgstr ""
+
+msgid ""
+"The configuration files for Mercurial use a simple ini-file format. A\n"
+"configuration file consists of sections, led by a ``[section]`` header\n"
+"and followed by ``name = value`` entries::"
+msgstr ""
+
+msgid ""
+"  [ui]\n"
+"  username = Firstname Lastname \n"
+"  verbose = True"
+msgstr ""
+
+msgid ""
+"The above entries will be referred to as ``ui.username`` and\n"
+"``ui.verbose``, respectively. Please see the hgrc man page for a full\n"
+"description of the possible configuration values:"
+msgstr ""
+
+msgid ""
+"- on Unix-like systems: ``man hgrc``\n"
+"- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
+msgstr ""
+
+msgid "Some commands allow the user to specify a date, e.g.:"
+msgstr ""
+
+msgid ""
+"- backout, commit, import, tag: Specify the commit date.\n"
+"- log, revert, update: Select revision(s) by date."
+msgstr ""
+
+msgid "Many date formats are valid. Here are some examples:"
+msgstr ""
+
+msgid ""
+"- ``Wed Dec 6 13:18:29 2006`` (local timezone assumed)\n"
+"- ``Dec 6 13:18 -0600`` (year assumed, time offset provided)\n"
+"- ``Dec 6 13:18 UTC`` (UTC and GMT are aliases for +0000)\n"
+"- ``Dec 6`` (midnight)\n"
+"- ``13:18`` (today assumed)\n"
+"- ``3:39`` (3:39AM assumed)\n"
+"- ``3:39pm`` (15:39)\n"
+"- ``2006-12-06 13:18:29`` (ISO 8601 format)\n"
+"- ``2006-12-6 13:18``\n"
+"- ``2006-12-6``\n"
+"- ``12-6``\n"
+"- ``12/6``\n"
+"- ``12/6/6`` (Dec 6 2006)"
+msgstr ""
+
+msgid "Lastly, there is Mercurial's internal format:"
+msgstr ""
+
+msgid "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)"
+msgstr ""
+
+msgid ""
+"This is the internal representation format for dates. unixtime is the\n"
+"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
+"the offset of the local timezone, in seconds west of UTC (negative if\n"
+"the timezone is east of UTC)."
+msgstr ""
+
+msgid "The log command also accepts date ranges:"
+msgstr ""
+
+msgid ""
+"- ``<{datetime}`` - at or before a given date/time\n"
+"- ``>{datetime}`` - on or after a given date/time\n"
+"- ``{datetime} to {datetime}`` - a date range, inclusive\n"
+"- ``-{days}`` - within a given number of days of today\n"
+msgstr ""
+
+msgid ""
+"Mercurial's default format for showing changes between two versions of\n"
+"a file is compatible with the unified format of GNU diff, which can be\n"
+"used by GNU patch and many other standard tools."
+msgstr ""
+
+msgid ""
+"While this standard format is often enough, it does not encode the\n"
+"following information:"
+msgstr ""
+
+msgid ""
+"- executable status and other permission bits\n"
+"- copy or rename information\n"
+"- changes in binary files\n"
+"- creation or deletion of empty files"
+msgstr ""
+
+msgid ""
+"Mercurial also supports the extended diff format from the git VCS\n"
+"which addresses these limitations. The git diff format is not produced\n"
+"by default because a few widespread tools still do not understand this\n"
+"format."
+msgstr ""
+
+msgid ""
+"This means that when generating diffs from a Mercurial repository\n"
+"(e.g. with :hg:`export`), you should be careful about things like file\n"
+"copies and renames or other things mentioned above, because when\n"
+"applying a standard diff to a different repository, this extra\n"
+"information is lost. Mercurial's internal operations (like push and\n"
+"pull) are not affected by this, because they use an internal binary\n"
+"format for communicating changes."
+msgstr ""
+
+msgid ""
+"To make Mercurial produce the git extended diff format, use the --git\n"
+"option available for many commands, or set 'git = True' in the [diff]\n"
+"section of your hgrc. You do not need to set this option when\n"
+"importing diffs in this format or using them in the mq extension.\n"
+msgstr ""
+
+msgid ""
+"HG\n"
+"    Path to the 'hg' executable, automatically passed when running\n"
+"    hooks, extensions or external tools. If unset or empty, this is\n"
+"    the hg executable's name if it's frozen, or an executable named\n"
+"    'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
+"    Windows) is searched."
+msgstr ""
+
+msgid ""
+"HGEDITOR\n"
+"    This is the name of the editor to run when committing. See EDITOR."
+msgstr ""
+
+msgid "    (deprecated, use .hgrc)"
+msgstr ""
+
+msgid ""
+"HGENCODING\n"
+"    This overrides the default locale setting detected by Mercurial.\n"
+"    This setting is used to convert data including usernames,\n"
+"    changeset descriptions, tag names, and branches. This setting can\n"
+"    be overridden with the --encoding command-line option."
+msgstr ""
+
+msgid ""
+"HGENCODINGMODE\n"
+"    This sets Mercurial's behavior for handling unknown characters\n"
+"    while transcoding user input. The default is \"strict\", which\n"
+"    causes Mercurial to abort if it can't map a character. Other\n"
+"    settings include \"replace\", which replaces unknown characters, and\n"
+"    \"ignore\", which drops them. This setting can be overridden with\n"
+"    the --encodingmode command-line option."
+msgstr ""
+
+msgid ""
+"HGMERGE\n"
+"    An executable to use for resolving merge conflicts. The program\n"
+"    will be executed with three arguments: local file, remote file,\n"
+"    ancestor file."
+msgstr ""
+
+msgid ""
+"HGRCPATH\n"
+"    A list of files or directories to search for hgrc files. Item\n"
+"    separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
+"    platform default search path is used. If empty, only the .hg/hgrc\n"
+"    from the current repository is read."
+msgstr ""
+
+msgid "    For each element in HGRCPATH:"
+msgstr ""
+
+msgid ""
+"    - if it's a directory, all files ending with .rc are added\n"
+"    - otherwise, the file itself will be added"
+msgstr ""
+
+msgid ""
+"HGPLAIN\n"
+"    When set, this disables any options in .hgrc that might change\n"
+"    Mercurial's default output. This includes encoding, defaults,\n"
+"    verbose mode, debug mode, quiet mode, tracebacks, and\n"
+"    localization. This can be useful when scripting against Mercurial\n"
+"    in the face of existing user configuration."
+msgstr ""
+
+msgid ""
+"    Equivalent options set via command line flags or environment\n"
+"    variables are not overridden."
+msgstr ""
+
+msgid ""
+"HGUSER\n"
+"    This is the string used as the author of a commit. If not set,\n"
+"    available values will be considered in this order:"
+msgstr ""
+
+msgid ""
+"    - HGUSER (deprecated)\n"
+"    - hgrc files from the HGRCPATH\n"
+"    - EMAIL\n"
+"    - interactive prompt\n"
+"    - LOGNAME (with ``@hostname`` appended)"
+msgstr ""
+
+msgid ""
+"EMAIL\n"
+"    May be used as the author of a commit; see HGUSER."
+msgstr ""
+
+msgid ""
+"LOGNAME\n"
+"    May be used as the author of a commit; see HGUSER."
+msgstr ""
+
+msgid ""
+"VISUAL\n"
+"    This is the name of the editor to use when committing. See EDITOR."
+msgstr ""
+
+msgid ""
+"EDITOR\n"
+"    Sometimes Mercurial needs to open a text file in an editor for a\n"
+"    user to modify, for example when writing commit messages. The\n"
+"    editor it uses is determined by looking at the environment\n"
+"    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
+"    non-empty one is chosen. If all of them are empty, the editor\n"
+"    defaults to 'vi'."
+msgstr ""
+
+msgid ""
+"PYTHONPATH\n"
+"    This is used by Python to find imported modules and may need to be\n"
+"    set appropriately if this Mercurial is not installed system-wide.\n"
+msgstr ""
+
+msgid ""
+"Mercurial has the ability to add new features through the use of\n"
+"extensions. Extensions may add new commands, add options to\n"
+"existing commands, change the default behavior of commands, or\n"
+"implement hooks."
+msgstr ""
+
+msgid ""
+"Extensions are not loaded by default for a variety of reasons:\n"
+"they can increase startup overhead; they may be meant for advanced\n"
+"usage only; they may provide potentially dangerous abilities (such\n"
+"as letting you destroy or modify history); they might not be ready\n"
+"for prime time; or they may alter some usual behaviors of stock\n"
+"Mercurial. It is thus up to the user to activate extensions as\n"
+"needed."
+msgstr ""
+
+msgid ""
+"To enable the \"foo\" extension, either shipped with Mercurial or in\n"
+"the Python search path, create an entry for it in your hgrc, like\n"
+"this::"
+msgstr ""
+
+msgid ""
+"  [extensions]\n"
+"  foo ="
+msgstr ""
+
+msgid "You may also specify the full path to an extension::"
+msgstr ""
+
+msgid ""
+"  [extensions]\n"
+"  myfeature = ~/.hgext/myfeature.py"
+msgstr ""
+
+msgid ""
+"To explicitly disable an extension enabled in an hgrc of broader\n"
+"scope, prepend its path with !::"
+msgstr ""
+
+msgid ""
+"  [extensions]\n"
+"  # disabling extension bar residing in /path/to/extension/bar.py\n"
+"  bar = !/path/to/extension/bar.py\n"
+"  # ditto, but no path was supplied for extension baz\n"
+"  baz = !\n"
+msgstr ""
+
+msgid ""
+"Ancestor\n"
+"    Any changeset that can be reached by an unbroken chain of parent\n"
+"    changesets from a given changeset. More precisely, the ancestors\n"
+"    of a changeset can be defined by two properties: a parent of a\n"
+"    changeset is an ancestor, and a parent of an ancestor is an\n"
+"    ancestor. See also: 'Descendant'."
+msgstr ""
+
+msgid ""
+"Branch\n"
+"    (Noun) A child changeset that has been created from a parent that\n"
+"    is not a head. These are known as topological branches, see\n"
+"    'Branch, topological'. If a topological branch is named, it becomes\n"
+"    a named branch. If a topological branch is not named, it becomes\n"
+"    an anonymous branch. See 'Branch, anonymous' and 'Branch, named'."
+msgstr ""
+
+msgid ""
+"    Branches may be created when changes are pulled from or pushed to\n"
+"    a remote repository, since new heads may be created by these\n"
+"    operations. Note that the term branch can also be used informally\n"
+"    to describe a development process in which certain development is\n"
+"    done independently of other development.This is sometimes done\n"
+"    explicitly with a named branch, but it can also be done locally,\n"
+"    using bookmarks or clones and anonymous branches."
+msgstr ""
+
+msgid "    Example: \"The experimental branch\"."
+msgstr ""
+
+msgid ""
+"    (Verb) The action of creating a child changeset which results in\n"
+"    its parent having more than one child."
+msgstr ""
+
+msgid "    Example: \"I'm going to branch at X\"."
+msgstr ""
+
+msgid ""
+"Branch, anonymous\n"
+"    Every time a new child changeset is created from a parent that is not\n"
+"    a head and the name of the branch is not changed, a new anonymous\n"
+"    branch is created."
+msgstr ""
+
+msgid ""
+"Branch, closed\n"
+"    A named branch whose branch heads have all been closed."
+msgstr ""
+
+msgid ""
+"Branch, default\n"
+"    The branch assigned to a changeset when no name has previously been\n"
+"    assigned."
+msgstr ""
+
+msgid ""
+"Branch head\n"
+"    See 'Head, branch'."
+msgstr ""
+
+msgid ""
+"Branch, named\n"
+"    A collection of changesets which have the same branch name. By\n"
+"    default, children of a changeset in a named branch belong to the\n"
+"    same named branch. A child can be explicitly assigned to a\n"
+"    different branch. See :hg:`help branch`, :hg:`help branches` and\n"
+"    :hg:`commit --close-branch` for more information on managing\n"
+"    branches."
+msgstr ""
+
+msgid ""
+"    Named branches can be thought of as a kind of namespace, dividing\n"
+"    the collection of changesets that comprise the repository into a\n"
+"    collection of disjoint subsets. A named branch is not necessarily\n"
+"    a topological branch. If a new named branch is created from the\n"
+"    head of another named branch, or the default branch, but no\n"
+"    further changesets are added to that previous branch, then that\n"
+"    previous branch will be a branch in name only."
+msgstr ""
+
+msgid ""
+"Branch tip\n"
+"    See 'Tip, branch'."
+msgstr ""
+
+msgid ""
+"Branch, topological\n"
+"    Every time a new child changeset is created from a parent that is\n"
+"    not a head, a new topological branch is created. If a topological\n"
+"    branch is named, it becomes a named branch. If a topological\n"
+"    branch is not named, it becomes an anonymous branch of the\n"
+"    current, possibly default, branch."
+msgstr ""
+
+msgid ""
+"Changelog\n"
+"    A record of the changesets in the order in which they were added\n"
+"    to the repository. This includes details such as changeset id,\n"
+"    author, commit message, date, and list of changed files."
+msgstr ""
+
+msgid ""
+"Changeset\n"
+"    A snapshot of the state of the repository used to record a change."
+msgstr ""
+
+msgid ""
+"Changeset, child\n"
+"    The converse of parent changeset: if P is a parent of C, then C is\n"
+"    a child of P. There is no limit to the number of children that a\n"
+"    changeset may have."
+msgstr ""
+
+msgid ""
+"Changeset id\n"
+"    A SHA-1 hash that uniquely identifies a changeset. It may be\n"
+"    represented as either a \"long\" 40-byte hexadecimal string, or a\n"
+"    \"short\" 12-byte hexadecimal string."
+msgstr ""
+
+msgid ""
+"Changeset, merge\n"
+"    A changeset with two parents. This occurs when a merge is\n"
+"    committed."
+msgstr ""
+
+msgid ""
+"Changeset, parent\n"
+"    A revision upon which a child changeset is based. Specifically, a\n"
+"    parent changeset of a changeset C is a changeset whose node\n"
+"    immediately precedes C in the DAG. Changesets have at most two\n"
+"    parents."
+msgstr ""
+
+msgid ""
+"Checkout\n"
+"    (Noun) The working directory being updated to a specific\n"
+"    revision. This use should probably be avoided where possible, as\n"
+"    changeset is much more appropriate than checkout in this context."
+msgstr ""
+
+msgid "    Example: \"I'm using checkout X.\""
+msgstr ""
+
+msgid ""
+"    (Verb) Updating the working directory to a specific changeset. See\n"
+"    :hg:`help update`."
+msgstr ""
+
+msgid "    Example: \"I'm going to check out changeset X.\""
+msgstr ""
+
+msgid ""
+"Child changeset\n"
+"    See 'Changeset, child'."
+msgstr ""
+
+msgid ""
+"Close changeset\n"
+"    See 'Changeset, close'."
+msgstr ""
+
+msgid ""
+"Closed branch\n"
+"    See 'Branch, closed'."
+msgstr ""
+
+msgid ""
+"Clone\n"
+"    (Noun) An entire or partial copy of a repository. The partial\n"
+"    clone must be in the form of a revision and its ancestors."
+msgstr ""
+
+msgid "    Example: \"Is your clone up to date?\"."
+msgstr ""
+
+msgid "    (Verb) The process of creating a clone, using :hg:`clone`."
+msgstr ""
+
+msgid "    Example: \"I'm going to clone the repository\"."
+msgstr ""
+
+msgid ""
+"Closed branch head\n"
+"    See 'Head, closed branch'."
+msgstr ""
+
+msgid ""
+"Commit\n"
+"    (Noun) A synonym for changeset."
+msgstr ""
+
+msgid "    Example: \"Is the bug fixed in your recent commit?\""
+msgstr ""
+
+msgid ""
+"    (Verb) The act of recording changes to a repository. When files\n"
+"    are committed in a working directory, Mercurial finds the\n"
+"    differences between the committed files and their parent\n"
+"    changeset, creating a new changeset in the repository."
+msgstr ""
+
+msgid "    Example: \"You should commit those changes now.\""
+msgstr ""
+
+msgid ""
+"Cset\n"
+"    A common abbreviation of the term changeset."
+msgstr ""
+
+msgid ""
+"DAG\n"
+"    The repository of changesets of a distributed version control\n"
+"    system (DVCS) can be described as a directed acyclic graph (DAG),\n"
+"    consisting of nodes and edges, where nodes correspond to\n"
+"    changesets and edges imply a parent -> child relation. This graph\n"
+"    can be visualized by graphical tools such as :hg:`glog`\n"
+"    (graphlog). In Mercurial, the DAG is limited by the requirement\n"
+"    for children to have at most two parents."
+msgstr ""
+
+msgid ""
+"Default branch\n"
+"    See 'Branch, default'."
+msgstr ""
+
+msgid ""
+"Descendant\n"
+"    Any changeset that can be reached by a chain of child changesets\n"
+"    from a given changeset. More precisely, the descendants of a\n"
+"    changeset can be defined by two properties: the child of a\n"
+"    changeset is a descendant, and the child of a descendant is a\n"
+"    descendant. See also: 'Ancestor'."
+msgstr ""
+
+msgid ""
+"Diff\n"
+"    (Noun) The difference between the contents and attributes of files\n"
+"    in two changesets or a changeset and the current working\n"
+"    directory. The difference is usually represented in a standard\n"
+"    form called a \"diff\" or \"patch\". The \"git diff\" format is used\n"
+"    when the changes include copies, renames, or changes to file\n"
+"    attributes, none of which can be represented/handled by classic\n"
+"    \"diff\" and \"patch\"."
+msgstr ""
+
+msgid "    Example: \"Did you see my correction in the diff?\""
+msgstr ""
+
+msgid ""
+"    (Verb) Diffing two changesets is the action of creating a diff or\n"
+"    patch."
+msgstr ""
+
+msgid ""
+"    Example: \"If you diff with changeset X, you will see what I mean.\""
+msgstr ""
+
+msgid ""
+"Directory, working\n"
+"    The working directory represents the state of the files tracked by\n"
+"    Mercurial, that will be recorded in the next commit. The working\n"
+"    directory initially corresponds to the snapshot at an existing\n"
+"    changeset, known as the parent of the working directory. See\n"
+"    'Parent, working directory'. The state may be modified by changes\n"
+"    to the files introduced manually or by a merge. The repository\n"
+"    metadata exists in the .hg directory inside the working directory."
+msgstr ""
+
+msgid ""
+"Graph\n"
+"    See DAG and :hg:`help graphlog`."
+msgstr ""
+
+msgid ""
+"Head\n"
+"    The term 'head' may be used to refer to both a branch head or a\n"
+"    repository head, depending on the context. See 'Head, branch' and\n"
+"    'Head, repository' for specific definitions."
+msgstr ""
+
+msgid ""
+"    Heads are where development generally takes place and are the\n"
+"    usual targets for update and merge operations."
+msgstr ""
+
+msgid ""
+"Head, branch\n"
+"    A changeset with no descendants on the same named branch."
+msgstr ""
+
+msgid ""
+"Head, closed branch\n"
+"    A changeset that marks a head as no longer interesting. The closed\n"
+"    head is no longer listed by :hg:`heads`. A branch is considered\n"
+"    closed when all its heads are closed and consequently is not\n"
+"    listed by :hg:`branches`."
+msgstr ""
+
+msgid ""
+"Head, repository\n"
+"    A topological head which has not been closed."
+msgstr ""
+
+msgid ""
+"Head, topological\n"
+"    A changeset with no children in the repository."
+msgstr ""
+
+msgid ""
+"History, immutable\n"
+"    Once committed, changesets cannot be altered.  Extensions which\n"
+"    appear to change history actually create new changesets that\n"
+"    replace existing ones, and then destroy the old changesets. Doing\n"
+"    so in public repositories can result in old changesets being\n"
+"    reintroduced to the repository."
+msgstr ""
+
+msgid ""
+"History, rewriting\n"
+"    The changesets in a repository are immutable. However, extensions\n"
+"    to Mercurial can be used to alter the repository, usually in such\n"
+"    a way as to preserve changeset contents."
+msgstr ""
+
+msgid ""
+"Immutable history\n"
+"    See 'History, immutable'."
+msgstr ""
+
+msgid ""
+"Merge changeset\n"
+"    See 'Changeset, merge'."
+msgstr ""
+
+msgid ""
+"Manifest\n"
+"    Each changeset has a manifest, which is the list of files that are\n"
+"    tracked by the changeset."
+msgstr ""
+
+msgid ""
+"Merge\n"
+"    Used to bring together divergent branches of work. When you update\n"
+"    to a changeset and then merge another changeset, you bring the\n"
+"    history of the latter changeset into your working directory. Once\n"
+"    conflicts are resolved (and marked), this merge may be committed\n"
+"    as a merge changeset, bringing two branches together in the DAG."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Named branch\n"
+"    See 'Branch, named'."
+msgstr "resetta il nome della branch al nome della branch genitore"
+
+msgid ""
+"Null changeset\n"
+"    The empty changeset. It is the parent state of newly-initialized\n"
+"    repositories and repositories with no checked out revision. It is\n"
+"    thus the parent of root changesets and the effective ancestor when\n"
+"    merging unrelated changesets. Can be specified by the alias 'null'\n"
+"    or by the changeset ID '000000000000'."
+msgstr ""
+
+msgid ""
+"Parent\n"
+"    See 'Changeset, parent'."
+msgstr ""
+
+msgid ""
+"Parent changeset\n"
+"    See 'Changeset, parent'."
+msgstr ""
+
+msgid ""
+"Parent, working directory\n"
+"    The working directory parent reflects a virtual revision which is\n"
+"    the child of the changeset (or two changesets with an uncommitted\n"
+"    merge) shown by :hg:`parents`. This is changed with\n"
+"    :hg:`update`. Other commands to see the working directory parent\n"
+"    are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"."
+msgstr ""
+
+msgid ""
+"Patch\n"
+"    (Noun) The product of a diff operation."
+msgstr ""
+
+msgid "    Example: \"I've sent you my patch.\""
+msgstr ""
+
+msgid ""
+"    (Verb) The process of using a patch file to transform one\n"
+"    changeset into another."
+msgstr ""
+
+msgid "    Example: \"You will need to patch that revision.\""
+msgstr ""
+
+msgid ""
+"Pull\n"
+"    An operation in which changesets in a remote repository which are\n"
+"    not in the local repository are brought into the local\n"
+"    repository. Note that this operation without special arguments\n"
+"    only updates the repository, it does not update the files in the\n"
+"    working directory. See :hg:`help pull`."
+msgstr ""
+
+msgid ""
+"Push\n"
+"    An operation in which changesets in a local repository which are\n"
+"    not in a remote repository are sent to the remote repository. Note\n"
+"    that this operation only adds changesets which have been committed\n"
+"    locally to the remote repository. Uncommitted changes are not\n"
+"    sent. See :hg:`help push`."
+msgstr ""
+
+msgid ""
+"Repository\n"
+"    The metadata describing all recorded states of a collection of\n"
+"    files. Each recorded state is represented by a changeset. A\n"
+"    repository is usually (but not always) found in the ``.hg``\n"
+"    subdirectory of a working directory. Any recorded state can be\n"
+"    recreated by \"updating\" a working directory to a specific\n"
+"    changeset."
+msgstr ""
+
+msgid ""
+"Repository head\n"
+"    See 'Head, repository'."
+msgstr ""
+
+msgid ""
+"Revision\n"
+"    A state of the repository at some point in time. Earlier revisions\n"
+"    can be updated to by using :hg:`update`.  See also 'Revision\n"
+"    number'; See also 'Changeset'."
+msgstr ""
+
+msgid ""
+"Revision number\n"
+"    This integer uniquely identifies a changeset in a specific\n"
+"    repository. It represents the order in which changesets were added\n"
+"    to a repository, starting with revision number 0. Note that the\n"
+"    revision number may be different in each clone of a repository. To\n"
+"    identify changesets uniquely between different clones, see\n"
+"    'Changeset id'."
+msgstr ""
+
+msgid ""
+"Revlog\n"
+"    History storage mechanism used by Mercurial. It is a form of delta\n"
+"    encoding, with occasional full revision of data followed by delta\n"
+"    of each successive revision. It includes data and an index\n"
+"    pointing to the data."
+msgstr ""
+
+msgid ""
+"Rewriting history\n"
+"    See 'History, rewriting'."
+msgstr ""
+
+msgid ""
+"Root\n"
+"    A changeset that has only the null changeset as its parent. Most\n"
+"    repositories have only a single root changeset."
+msgstr ""
+
+msgid ""
+"Tip\n"
+"    The changeset with the highest revision number. It is the changeset\n"
+"    most recently added in a repository."
+msgstr ""
+
+msgid ""
+"Tip, branch\n"
+"    The head of a given branch with the highest revision number. When\n"
+"    a branch name is used as a revision identifier, it refers to the\n"
+"    branch tip. See also 'Branch, head'. Note that because revision\n"
+"    numbers may be different in different repository clones, the\n"
+"    branch tip may be different in different cloned repositories."
+msgstr ""
+
+msgid ""
+"Update\n"
+"    (Noun) Another synonym of changeset."
+msgstr ""
+
+msgid "    Example: \"I've pushed an update\"."
+msgstr ""
+
+msgid ""
+"    (Verb) This term is usually used to describe updating the state of\n"
+"    the working directory to that of a specific changeset. See\n"
+"    :hg:`help update`."
+msgstr ""
+
+msgid "    Example: \"You should update\"."
+msgstr ""
+
+msgid ""
+"Working directory\n"
+"    See 'Directory, working'."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Working directory parent\n"
+"    See 'Parent, working directory'.\n"
+msgstr "stampa la radice (top) della directory di lavoro corrente"
+
+msgid ""
+"Mercurial's internal web server, hgweb, can serve either a single\n"
+"repository, or a collection of them. In the latter case, a special\n"
+"configuration file can be used to specify the repository paths to use\n"
+"and global web configuration options."
+msgstr ""
+
+msgid ""
+"This file uses the same syntax as hgrc configuration files, but only\n"
+"the following sections are recognized:"
+msgstr ""
+
+msgid ""
+"  - web\n"
+"  - paths\n"
+"  - collections"
+msgstr ""
+
+msgid ""
+"The ``web`` section can specify all the settings described in the web\n"
+"section of the hgrc documentation."
+msgstr ""
+
+msgid ""
+"The ``paths`` section provides mappings of physical repository\n"
+"paths to virtual ones. For instance::"
+msgstr ""
+
+msgid ""
+"  [paths]\n"
+"  projects/a = /foo/bar\n"
+"  projects/b = /baz/quux\n"
+"  web/root = /real/root/*\n"
+"  / = /real/root2/*\n"
+"  virtual/root2 = /real/root2/**"
+msgstr ""
+
+msgid ""
+"- The first two entries make two repositories in different directories\n"
+"  appear under the same directory in the web interface\n"
+"- The third entry maps every Mercurial repository found in '/real/root'\n"
+"  into 'web/root'. This format is preferred over the [collections] one,\n"
+"  since using absolute paths as configuration keys is not supported on "
+"every\n"
+"  platform (especially on Windows).\n"
+"- The fourth entry is a special case mapping all repositories in\n"
+"  '/real/root2' in the root of the virtual directory.\n"
+"- The fifth entry recursively finds all repositories under the real\n"
+"  root, and maps their relative paths under the virtual root."
+msgstr ""
+
+msgid ""
+"The ``collections`` section provides mappings of trees of physical\n"
+"repositories paths to virtual ones, though the paths syntax is generally\n"
+"preferred. For instance::"
+msgstr ""
+
+msgid ""
+"  [collections]\n"
+"  /foo = /foo"
+msgstr ""
+
+msgid ""
+"Here, the left side will be stripped off all repositories found in the\n"
+"right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n"
+"``bar`` and ``quux/baz`` respectively.\n"
+msgstr ""
+
+msgid ""
+"When Mercurial accepts more than one revision, they may be specified\n"
+"individually, or provided as a topologically continuous range,\n"
+"separated by the \":\" character."
+msgstr ""
+
+msgid ""
+"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
+"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
+"specified, it defaults to revision number 0. If END is not specified,\n"
+"it defaults to the tip. The range \":\" thus means \"all revisions\"."
+msgstr ""
+
+msgid "If BEGIN is greater than END, revisions are treated in reverse order."
+msgstr ""
+
+msgid ""
+"A range acts as a closed interval. This means that a range of 3:5\n"
+"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
+msgstr ""
+
+msgid ""
+"Mercurial accepts several notations for identifying one or more files\n"
+"at a time."
+msgstr ""
+
+msgid ""
+"By default, Mercurial treats filenames as shell-style extended glob\n"
+"patterns."
+msgstr ""
+
+msgid "Alternate pattern notations must be specified explicitly."
+msgstr ""
+
+msgid ""
+"To use a plain path name without any pattern matching, start it with\n"
+"``path:``. These path names must completely match starting at the\n"
+"current repository root."
+msgstr ""
+
+msgid ""
+"To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
+"at the current directory; a glob such as ``*.c`` will only match files\n"
+"in the current directory ending with ``.c``."
+msgstr ""
+
+msgid ""
+"The supported glob syntax extensions are ``**`` to match any string\n"
+"across path separators and ``{a,b}`` to mean \"a or b\"."
+msgstr ""
+
+msgid ""
+"To use a Perl/Python regular expression, start a name with ``re:``.\n"
+"Regexp pattern matching is anchored at the root of the repository."
+msgstr ""
+
+msgid "Plain examples::"
+msgstr ""
+
+msgid ""
+"  path:foo/bar   a name bar in a directory named foo in the root\n"
+"                 of the repository\n"
+"  path:path:name a file or directory named \"path:name\""
+msgstr ""
+
+msgid "Glob examples::"
+msgstr ""
+
+msgid ""
+"  glob:*.c       any name ending in \".c\" in the current directory\n"
+"  *.c            any name ending in \".c\" in the current directory\n"
+"  **.c           any name ending in \".c\" in any subdirectory of the\n"
+"                 current directory including itself.\n"
+"  foo/*.c        any name ending in \".c\" in the directory foo\n"
+"  foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
+"                 including itself."
+msgstr ""
+
+msgid "Regexp examples::"
+msgstr ""
+
+msgid ""
+"  re:.*\\.c$      any name ending in \".c\", anywhere in the repository\n"
+msgstr ""
+
+msgid "Mercurial supports several ways to specify individual revisions."
+msgstr ""
+
+msgid ""
+"A plain integer is treated as a revision number. Negative integers are\n"
+"treated as sequential offsets from the tip, with -1 denoting the tip,\n"
+"-2 denoting the revision prior to the tip, and so forth."
+msgstr ""
+
+msgid ""
+"A 40-digit hexadecimal string is treated as a unique revision\n"
+"identifier."
+msgstr ""
+
+msgid ""
+"A hexadecimal string less than 40 characters long is treated as a\n"
+"unique revision identifier and is referred to as a short-form\n"
+"identifier. A short-form identifier is only valid if it is the prefix\n"
+"of exactly one full-length identifier."
+msgstr ""
+
+msgid ""
+"Any other string is treated as a tag or branch name. A tag name is a\n"
+"symbolic name associated with a revision identifier. A branch name\n"
+"denotes the tipmost revision of that branch. Tag and branch names must\n"
+"not contain the \":\" character."
+msgstr ""
+
+msgid ""
+"The reserved name \"tip\" is a special tag that always identifies the\n"
+"most recent revision."
+msgstr ""
+
+msgid ""
+"The reserved name \"null\" indicates the null revision. This is the\n"
+"revision of an empty repository, and the parent of revision 0."
+msgstr ""
+
+msgid ""
+"The reserved name \".\" indicates the working directory parent. If no\n"
+"working directory is checked out, it is equivalent to null. If an\n"
+"uncommitted merge is in progress, \".\" is the revision of the first\n"
+"parent.\n"
+msgstr ""
+
+msgid ""
+"Mercurial supports a functional language for selecting a set of\n"
+"revisions."
+msgstr ""
+
+msgid ""
+"The language supports a number of predicates which are joined by infix\n"
+"operators. Parenthesis can be used for grouping."
+msgstr ""
+
+msgid ""
+"Identifiers such as branch names must be quoted with single or double\n"
+"quotes if they contain characters outside of\n"
+"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n"
+"predicates. Special characters can be used in quoted identifiers by\n"
+"escaping them, e.g., ``\\n`` is interpreted as a newline."
+msgstr ""
+
+msgid "There is a single prefix operator:"
+msgstr ""
+
+msgid ""
+"``not x``\n"
+"  Changesets not in x. Short form is ``! x``."
+msgstr ""
+
+msgid "These are the supported infix operators:"
+msgstr ""
+
+msgid ""
+"``x::y``\n"
+"  A DAG range, meaning all changesets that are descendants of x and\n"
+"  ancestors of y, including x and y themselves. If the first endpoint\n"
+"  is left out, this is equivalent to ``ancestors(y)``, if the second\n"
+"  is left out it is equivalent to ``descendants(x)``."
+msgstr ""
+
+msgid "  An alternative syntax is ``x..y``."
+msgstr ""
+
+msgid ""
+"``x:y``\n"
+"  All changesets with revision numbers between x and y, both\n"
+"  inclusive. Either endpoint can be left out, they default to 0 and\n"
+"  tip."
+msgstr ""
+
+msgid ""
+"``x and y``\n"
+"  The intersection of changesets in x and y. Short form is ``x & y``."
+msgstr ""
+
+msgid ""
+"``x or y``\n"
+"  The union of changesets in x and y. There are two alternative short\n"
+"  forms: ``x | y`` and ``x + y``."
+msgstr ""
+
+msgid ""
+"``x - y``\n"
+"  Changesets in x but not in y."
+msgstr ""
+
+msgid "The following predicates are supported:"
+msgstr ""
+
+msgid ""
+"``adds(pattern)``\n"
+"  Changesets that add a file matching pattern."
+msgstr ""
+
+msgid ""
+"``all()``\n"
+"  All changesets, the same as ``0:tip``."
+msgstr ""
+
+msgid ""
+"``ancestor(single, single)``\n"
+"  Greatest common ancestor of the two changesets."
+msgstr ""
+
+msgid ""
+"``ancestors(set)``\n"
+"  Changesets that are ancestors of a changeset in set."
+msgstr ""
+
+msgid ""
+"``author(string)``\n"
+"  Alias for ``user(string)``."
+msgstr ""
+
+msgid ""
+"``branch(set)``\n"
+"  The branch names are found for changesets in set, and the result is\n"
+"  all changesets belonging to one those branches."
+msgstr ""
+
+msgid ""
+"``children(set)``\n"
+"  Child changesets of changesets in set."
+msgstr ""
+
+msgid ""
+"``closed()``\n"
+"  Changeset is closed."
+msgstr ""
+
+msgid ""
+"``contains(pattern)``\n"
+"  Revision contains pattern."
+msgstr ""
+
+msgid ""
+"``date(interval)``\n"
+"  Changesets within the interval, see :hg:`help dates`."
+msgstr ""
+
+msgid ""
+"``descendants(set)``\n"
+"  Changesets which are decendants of changesets in set."
+msgstr ""
+
+msgid ""
+"``file(pattern)``\n"
+"  Changesets which manually affected files matching pattern."
+msgstr ""
+
+msgid ""
+"``follow()``\n"
+"  An alias for ``::.`` (ancestors of the working copy's first parent)."
+msgstr ""
+
+msgid ""
+"``grep(regex)``\n"
+"  Like ``keyword(string)`` but accepts a regex."
+msgstr ""
+
+msgid ""
+"``head()``\n"
+"  Changeset is a head."
+msgstr ""
+
+msgid ""
+"``heads(set)``\n"
+"  Members of set with no children in set."
+msgstr ""
+
+msgid ""
+"``keyword(string)``\n"
+"  Search commit message, user name, and names of changed files for\n"
+"  string."
+msgstr ""
+
+msgid ""
+"``limit(set, n)``\n"
+"  First n members of set."
+msgstr ""
+
+msgid ""
+"``max(set)``\n"
+"  Changeset with highest revision number in set."
+msgstr ""
+
+msgid ""
+"``merge()``\n"
+"  Changeset is a merge changeset."
+msgstr ""
+
+msgid ""
+"``modifies(pattern)``\n"
+"  Changesets which modify files matching pattern."
+msgstr ""
+
+msgid ""
+"``outgoing([path])``\n"
+"  Changesets missing in path."
+msgstr ""
+
+msgid ""
+"``p1(set)``\n"
+"  First parent of changesets in set."
+msgstr ""
+
+msgid ""
+"``p2(set)``\n"
+"  Second parent of changesets in set."
+msgstr ""
+
+msgid ""
+"``parents(set)``\n"
+"  The set of all parents for all changesets in set."
+msgstr ""
+
+msgid ""
+"``removes(pattern)``\n"
+"  Changesets which remove files matching pattern."
+msgstr ""
+
+msgid ""
+"``reverse(set)``\n"
+"  Reverse order of set."
+msgstr ""
+
+msgid ""
+"``roots(set)``\n"
+"  Changesets with no parent changeset in set."
+msgstr ""
+
+msgid ""
+"``sort(set[, [-]key...])``\n"
+"  Sort set by keys. The default sort order is ascending, specify a key\n"
+"  as ``-key`` to sort in descending order."
+msgstr ""
+
+msgid "  The keys can be:"
+msgstr ""
+
+msgid ""
+"  - ``rev`` for the revision number,\n"
+"  - ``branch`` for the branch name,\n"
+"  - ``desc`` for the commit message (description),\n"
+"  - ``user`` for user name (``author`` can be used as an alias),\n"
+"  - ``date`` for the commit date"
+msgstr ""
+
+msgid ""
+"``tagged()``\n"
+"  Changeset is tagged."
+msgstr ""
+
+msgid ""
+"``user(string)``\n"
+"  User name is string."
+msgstr ""
+
+msgid "Command line equivalents for :hg:`log`::"
+msgstr ""
+
+msgid ""
+"  -f    ->  ::.\n"
+"  -d x  ->  date(x)\n"
+"  -k x  ->  keyword(x)\n"
+"  -m    ->  merge()\n"
+"  -u x  ->  user(x)\n"
+"  -b x  ->  branch(x)\n"
+"  -P x  ->  !::x\n"
+"  -l x  ->  limit(expr, x)"
+msgstr ""
+
+msgid "Some sample queries::"
+msgstr ""
+
+msgid ""
+"  hg log -r 'branch(default)'\n"
+"  hg log -r 'branch(default) and 1.5:: and not merge()'\n"
+"  hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n"
+"  hg log -r 'sort(date(\"May 2008\"), user)'\n"
+"  hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n"
+msgstr ""
+
+msgid ""
+"Mercurial allows you to customize output of commands through\n"
+"templates. You can either pass in a template from the command\n"
+"line, via the --template option, or select an existing\n"
+"template-style (--style)."
+msgstr ""
+
+msgid ""
+"You can customize output for any \"log-like\" command: log,\n"
+"outgoing, incoming, tip, parents, heads and glog."
+msgstr ""
+
+msgid ""
+"Four styles are packaged with Mercurial: default (the style used\n"
+"when no explicit preference is passed), compact, changelog,\n"
+"and xml.\n"
+"Usage::"
+msgstr ""
+
+msgid "    $ hg log -r1 --style changelog"
+msgstr ""
+
+msgid ""
+"A template is a piece of text, with markup to invoke variable\n"
+"expansion::"
+msgstr ""
+
+msgid ""
+"    $ hg log -r1 --template \"{node}\\n\"\n"
+"    b56ce7b07c52de7d5fd79fb89701ea538af65746"
+msgstr ""
+
+msgid ""
+"Strings in curly braces are called keywords. The availability of\n"
+"keywords depends on the exact context of the templater. These\n"
+"keywords are usually available for templating a log-like command:"
+msgstr ""
+
+msgid ":author: String. The unmodified author of the changeset."
+msgstr ""
+
+msgid ""
+":branches: String. The name of the branch on which the changeset was\n"
+"    committed. Will be empty if the branch name was default."
+msgstr ""
+
+msgid ":date: Date information. The date when the changeset was committed."
+msgstr ""
+
+msgid ":desc: String. The text of the changeset description."
+msgstr ""
+
+msgid ""
+":diffstat: String. Statistics of changes with the following format:\n"
+"    \"modified files: +added/-removed lines\""
+msgstr ""
+
+msgid ""
+":files: List of strings. All files modified, added, or removed by this\n"
+"    changeset."
+msgstr ""
+
+msgid ":file_adds: List of strings. Files added by this changeset."
+msgstr ""
+
+msgid ""
+":file_copies: List of strings. Files copied in this changeset with\n"
+"    their sources."
+msgstr ""
+
+msgid ""
+":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
+"    only if the --copied switch is set."
+msgstr ""
+
+msgid ":file_mods: List of strings. Files modified by this changeset."
+msgstr ""
+
+msgid ":file_dels: List of strings. Files removed by this changeset."
+msgstr ""
+
+msgid ""
+":node: String. The changeset identification hash, as a 40-character\n"
+"    hexadecimal string."
+msgstr ""
+
+msgid ":parents: List of strings. The parents of the changeset."
+msgstr ""
+
+msgid ":rev: Integer. The repository-local changeset revision number."
+msgstr ""
+
+msgid ":tags: List of strings. Any tags associated with the changeset."
+msgstr ""
+
+msgid ""
+":latesttag: String. Most recent global tag in the ancestors of this\n"
+"    changeset."
+msgstr ""
+
+msgid ":latesttagdistance: Integer. Longest path to the latest tag."
+msgstr ""
+
+msgid ""
+"The \"date\" keyword does not produce human-readable output. If you\n"
+"want to use a date in your output, you can use a filter to process\n"
+"it. Filters are functions which return a string based on the input\n"
+"variable. Be sure to use the stringify filter first when you're\n"
+"applying a string-input filter to a list-like input variable.\n"
+"You can also use a chain of filters to get the desired output::"
+msgstr ""
+
+msgid ""
+"   $ hg tip --template \"{date|isodate}\\n\"\n"
+"   2008-08-21 18:22 +0000"
+msgstr ""
+
+msgid "List of filters:"
+msgstr ""
+
+msgid ""
+":addbreaks: Any text. Add an XHTML \"
\" tag before the end of\n"
+"    every line except the last."
+msgstr ""
+
+msgid ""
+":age: Date. Returns a human-readable date/time difference between the\n"
+"    given date/time and the current date/time."
+msgstr ""
+
+msgid ""
+":basename: Any text. Treats the text as a path, and returns the last\n"
+"    component of the path after splitting by the path separator\n"
+"    (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
+"    \"baz\" and \"foo/bar//\" becomes \"bar\"."
+msgstr ""
+
+msgid ""
+":stripdir: Treat the text as path and strip a directory level, if\n"
+"    possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"."
+msgstr ""
+
+msgid ""
+":date: Date. Returns a date in a Unix date format, including the\n"
+"    timezone: \"Mon Sep 04 15:13:13 2006 0700\"."
+msgstr ""
+
+msgid ""
+":domain: Any text. Finds the first string that looks like an email\n"
+"    address, and extracts just the domain component. Example: ``User\n"
+"    `` becomes ``example.com``."
+msgstr ""
+
+msgid ""
+":email: Any text. Extracts the first string that looks like an email\n"
+"    address. Example: ``User `` becomes\n"
+"    ``user@example.com``."
+msgstr ""
+
+msgid ""
+":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
+"    and \">\" with XML entities."
+msgstr ""
+
+msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
+msgstr ""
+
+msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
+msgstr ""
+
+msgid ":firstline: Any text. Returns the first line of text."
+msgstr ""
+
+msgid ":nonempty: Any text. Returns '(none)' if the string is empty."
+msgstr ""
+
+msgid ""
+":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n"
+"    25200\" (Unix timestamp, timezone offset)."
+msgstr ""
+
+msgid ""
+":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n"
+"    +0200\"."
+msgstr ""
+
+msgid ""
+":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
+"    seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n"
+"    filter."
+msgstr ""
+
+msgid ":localdate: Date. Converts a date to local date."
+msgstr ""
 
-#, python-format
-msgid "unrecognized profiling format '%s' - Ignored\n"
+msgid ""
+":obfuscate: Any text. Returns the input text rendered as a sequence of\n"
+"    XML entities."
 msgstr ""
 
-msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
+msgid ":person: Any text. Returns the text before an email address."
 msgstr ""
 
-#, python-format
-msgid "*** failed to import extension %s from %s: %s\n"
-msgstr "*** fallita l'importazione dell'estensione %s da %s: %s\n"
+msgid ""
+":rfc822date: Date. Returns a date using the same format used in email\n"
+"    headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
+msgstr ""
 
-#, python-format
-msgid "*** failed to import extension %s: %s\n"
-msgstr "*** fallita l'importazione dell'estensione %s: %s\n"
+msgid ""
+":rfc3339date: Date. Returns a date using the Internet date format\n"
+"    specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"."
+msgstr ""
 
-#, python-format
-msgid "couldn't find merge tool %s\n"
-msgstr "non è stato possibile trovare il tool per il merge %s\n"
+msgid ""
+":short: Changeset hash. Returns the short form of a changeset hash,\n"
+"    i.e. a 12-byte hexadecimal string."
+msgstr ""
 
-#, python-format
-msgid "tool %s can't handle symlinks\n"
-msgstr "il tool %s non può gestire link simbolici\n"
+msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
+msgstr ""
 
-#, python-format
-msgid "tool %s can't handle binary\n"
-msgstr "il tool %s non può gestire file binari\n"
+msgid ":strip: Any text. Strips all leading and trailing whitespace."
+msgstr ""
 
-#, python-format
-msgid "tool %s requires a GUI\n"
-msgstr "il tool %s richiede una GUI\n"
+msgid ""
+":tabindent: Any text. Returns the text, with every line except the\n"
+"     first starting with a tab character."
+msgstr ""
 
-#, python-format
 msgid ""
-" no tool found to merge %s\n"
-"keep (l)ocal or take (o)ther?"
+":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
+"    \"foo bar\" becomes \"foo%20bar\"."
 msgstr ""
 
-msgid "&Local"
+msgid ":user: Any text. Returns the user portion of an email address.\n"
 msgstr ""
 
-msgid "&Other"
+msgid "Valid URLs are of the form::"
 msgstr ""
 
-#, python-format
-msgid "merging %s and %s to %s\n"
-msgstr "sto effettuando il merge di %s e %s in %s\n"
+msgid ""
+"  local/filesystem/path[#revision]\n"
+"  file://local/filesystem/path[#revision]\n"
+"  http://[user[:pass]@]host[:port]/[path][#revision]\n"
+"  https://[user[:pass]@]host[:port]/[path][#revision]\n"
+"  ssh://[user[:pass]@]host[:port]/[path][#revision]"
+msgstr ""
 
-#, python-format
-msgid "merging %s\n"
-msgstr "sto effettuando il merge di %s\n"
+msgid ""
+"Paths in the local filesystem can either point to Mercurial\n"
+"repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n"
+"incoming --bundle`)."
+msgstr ""
 
-#, python-format
 msgid ""
-" output file %s appears unchanged\n"
-"was merge successful (yn)?"
+"An optional identifier after # indicates a particular branch, tag, or\n"
+"changeset to use from the remote repository. See also :hg:`help\n"
+"revisions`."
 msgstr ""
 
-msgid "&No"
+msgid ""
+"Some features, such as pushing to http:// and https:// URLs are only\n"
+"possible if the feature is explicitly enabled on the remote Mercurial\n"
+"server."
 msgstr ""
 
-msgid "&Yes"
+msgid "Some notes about using SSH with Mercurial:"
 msgstr ""
 
-#, python-format
-msgid "merging %s failed!\n"
-msgstr "merge di %s fallito!\n"
+msgid ""
+"- SSH requires an accessible shell account on the destination machine\n"
+"  and a copy of hg in the remote path or specified with as remotecmd.\n"
+"- path is relative to the remote user's home directory by default. Use\n"
+"  an extra slash at the start of a path to specify an absolute path::"
+msgstr ""
 
-#, python-format
-msgid "Inconsistent state, %s:%s is good and bad"
-msgstr "Stato inconsistente, %s:%s è buona e cattiva"
+msgid "    ssh://example.com//tmp/repository"
+msgstr ""
 
-#, python-format
-msgid "unknown bisect kind %s"
+msgid ""
+"- Mercurial doesn't use its own compression via SSH; the right thing\n"
+"  to do is to configure it in your ~/.ssh/config, e.g.::"
 msgstr ""
 
-#, fuzzy
-msgid "disabled extensions:"
+msgid ""
+"    Host *.mylocalnetwork.example.com\n"
+"      Compression no\n"
+"    Host *\n"
+"      Compression yes"
 msgstr ""
-"\n"
-"estensioni abilitate:\n"
-"\n"
 
-msgid "Date Formats"
-msgstr "Formati della data"
+msgid ""
+"  Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
+"  with the --ssh command line option."
+msgstr ""
 
-msgid "File Name Patterns"
-msgstr "Pattern dei Nomi dei File"
+msgid ""
+"These URLs can all be stored in your hgrc with path aliases under the\n"
+"[paths] section like so::"
+msgstr ""
 
-msgid "Environment Variables"
-msgstr "Variabili d'ambiente"
+msgid ""
+"  [paths]\n"
+"  alias1 = URL1\n"
+"  alias2 = URL2\n"
+"  ..."
+msgstr ""
 
-msgid "Specifying Single Revisions"
+msgid ""
+"You can then use the alias for any command that uses a URL (for\n"
+"example :hg:`pull alias1` will be treated as :hg:`pull URL1`)."
 msgstr ""
 
-msgid "Specifying Multiple Revisions"
-msgstr "Specificare Revisioni Multiple"
+msgid ""
+"Two path aliases are special because they are used as defaults when\n"
+"you do not provide the URL to a command:"
+msgstr ""
 
-msgid "Diff Formats"
-msgstr "Formati di diff"
+msgid ""
+"default:\n"
+"  When you create a repository with hg clone, the clone command saves\n"
+"  the location of the source repository as the new repository's\n"
+"  'default' path. This is then used when you omit path from push- and\n"
+"  pull-like commands (including incoming and outgoing)."
+msgstr ""
 
-msgid "Template Usage"
+msgid ""
+"default-push:\n"
+"  The push command will look for a path named 'default-push', and\n"
+"  prefer it over 'default' if both are defined.\n"
 msgstr ""
 
 #, fuzzy
-msgid "URL Paths"
-msgstr "Percorsi url"
+msgid "remote branch lookup not supported"
+msgstr "requisito '%s' non supportato"
 
-#, fuzzy
-msgid "Using additional features"
-msgstr "abilita output aggiuntivo"
+msgid "dirstate branch not accessible"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "unknown branch '%s'"
+msgstr "revisione sconosciuta '%s'"
 
 msgid "can only share local repositories"
 msgstr ""
 
-#, fuzzy
 msgid "destination already exists"
-msgstr "la destinazione '%s' esiste già"
+msgstr "la destinazione esiste già"
 
 msgid "updating working directory\n"
 msgstr "sto aggiornando la directory di lavoro\n"
@@ -8965,32 +11661,36 @@
 msgid "destination '%s' already exists"
 msgstr "la destinazione '%s' esiste già"
 
-#, fuzzy, python-format
+#, python-format
 msgid "destination '%s' is not empty"
-msgstr "la destinazione %s non è una directory"
+msgstr "la destinazione '%s' non è vuota"
 
-msgid "src repository does not support revision lookup and so doesn't support clone by revision"
+msgid ""
+"src repository does not support revision lookup and so doesn't support clone "
+"by revision"
 msgstr ""
 
 msgid "clone from remote to remote not supported"
 msgstr "clone da remoto a remoto non supportato"
 
-#, fuzzy, python-format
+#, python-format
 msgid "updating to branch %s\n"
-msgstr "sto aggiornando la cache delle branch\n"
+msgstr "sto aggiornando al branch %s\n"
 
 #, python-format
-msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n"
+msgid ""
+"%d files updated, %d files merged, %d files removed, %d files unresolved\n"
 msgstr ""
 
 msgid "use 'hg resolve' to retry unresolved file merges\n"
 msgstr "usa 'hg resolve' per riprovare i merge sui file non risolti\n"
 
-#, fuzzy
-msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n"
+msgid ""
+"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to "
+"abandon\n"
 msgstr ""
 "usa 'hg resolve' per riprovare i merge sui file non risolti o\n"
-"'hg up --clean' per abbandonare\n"
+"'hg update -C' per abbandonare\n"
 
 msgid "(branch merge, don't forget to commit)\n"
 msgstr "(merge su branch, non dimenticare di effettuare il commit)\n"
@@ -9002,9 +11702,8 @@
 msgid "SSL support is unavailable"
 msgstr "Supporto SSL non disponibile"
 
-#, fuzzy
 msgid "IPv6 is not available on this system"
-msgstr "IPv6 non disponibile su questo sistema"
+msgstr "IPv6 non è disponibile su questo sistema"
 
 #, python-format
 msgid "cannot start server at '%s:%d': %s"
@@ -9018,6 +11717,12 @@
 msgid "%s hook is invalid (\"%s\" not in a module)"
 msgstr "l'hook %s non è valido (\"%s\" non in un modulo)"
 
+msgid "exception from first failed import attempt:\n"
+msgstr ""
+
+msgid "exception from second failed import attempt:\n"
+msgstr ""
+
 #, python-format
 msgid "%s hook is invalid (import of \"%s\" failed)"
 msgstr ""
@@ -9078,8 +11783,12 @@
 msgid "real URL is %s\n"
 msgstr "il vero URL è %s\n"
 
-#, python-format
-msgid "'%s' does not appear to be an hg repository"
+#, fuzzy, python-format
+msgid ""
+"'%s' does not appear to be an hg repository:\n"
+"---%%<--- (%s)\n"
+"%s\n"
+"---%%<---\n"
 msgstr "'%s' non sembra essere un repository hg"
 
 #, python-format
@@ -9102,6 +11811,9 @@
 msgid "push failed (unexpected response):"
 msgstr "push fallito (risposta inattesa):"
 
+msgid "remote: "
+msgstr "remoto: "
+
 #, python-format
 msgid "push failed: %s"
 msgstr "push fallito: %s"
@@ -9140,19 +11852,25 @@
 msgid "%r cannot be used in a tag name"
 msgstr ""
 
+#, fuzzy, python-format
+msgid "warning: tag %s conflicts with existing branch name\n"
+msgstr "attenzione: conflitti durante il merge.\n"
+
 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
-msgstr "la copia di lavoro di .hgtags è cambiata (si prega di effettuare il commit manuale di .hgtags)"
+msgstr ""
+"la copia di lavoro di .hgtags è cambiata (si prega di effettuare il commit "
+"manuale di .hgtags)"
 
-#, fuzzy, python-format
+#, python-format
 msgid "working directory has unknown parent '%s'!"
-msgstr "directory di lavoro di %s"
+msgstr "la directory di lavoro ha il genitore sconosciuto '%s'"
 
 #, python-format
 msgid "unknown revision '%s'"
 msgstr "revisione sconosciuta '%s'"
 
-msgid "journal already exists - run hg recover"
-msgstr "il journal esiste già - eseguire hg recover"
+msgid "abandoned transaction found - run hg recover"
+msgstr ""
 
 msgid "rolling back interrupted transaction\n"
 msgstr "sto effettuando il rollback della transazione interrotta\n"
@@ -9160,7 +11878,16 @@
 msgid "no interrupted transaction available\n"
 msgstr "nessuna transazione interrotta disponibile\n"
 
-msgid "rolling back last transaction\n"
+#, python-format
+msgid "rolling back to revision %s (undo %s: %s)\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "rolling back to revision %s (undo %s)\n"
+msgstr "Trovata revisione %s da %s\n"
+
+#, fuzzy
+msgid "rolling back unknown transaction\n"
 msgstr "sto effettuando il rollback dell'ultima transazione\n"
 
 #, python-format
@@ -9186,117 +11913,81 @@
 msgstr ""
 
 #, fuzzy
-msgid "file not found!"
-msgstr "file %s non trovato!"
-
-#, fuzzy
-msgid "no match under directory!"
-msgstr "nessuna corrispondenza sotto la directory %s!"
-
-#, fuzzy
-msgid "file not tracked!"
-msgstr "il file %s non è tracciato!"
-
-msgid "unresolved merge conflicts (see hg resolve)"
-msgstr ""
-
-#, fuzzy, python-format
-msgid "committing subrepository %s\n"
-msgstr "repository·%s"
-
-#, python-format
-msgid "trouble committing %s!\n"
-msgstr ""
-
-#, python-format
-msgid "%s does not exist!\n"
-msgstr "%s non esiste!\n"
-
-#, python-format
-msgid ""
-"%s: files over 10MB may cause memory and performance problems\n"
-"(use 'hg revert %s' to unadd the file)\n"
-msgstr ""
-"%s: file oltre i 10MB potrebbero causare problemi di memoria\n"
-"e performance (usare 'hg revert %s' per annullare l'aggiunta\n"
-"del file)\n"
-
-#, python-format
-msgid "%s not added: only files and symlinks supported currently\n"
-msgstr "%s non aggiunto: attualmente solo file e link simbolici sono supportati\n"
-
-#, python-format
-msgid "%s already tracked!\n"
-msgstr "%s è già tracciato!\n"
-
-#, python-format
-msgid "%s not added!\n"
-msgstr "%s non aggiunto!\n"
-
-#, python-format
-msgid "%s still exists!\n"
-msgstr ""
-
-#, python-format
-msgid "%s not tracked!\n"
-msgstr "%s non è tracciato!\n"
-
-#, python-format
-msgid "%s not removed!\n"
-msgstr ""
-
-#, python-format
-msgid "copy failed: %s is not a file or a symbolic link\n"
-msgstr ""
-
-msgid "searching for changes\n"
-msgstr "sto cercando modifiche\n"
+msgid "can't commit subrepos without .hgsub"
+msgstr "commit del subrepository %s\n"
 
-msgid "already have changeset "
-msgstr ""
-
-msgid "warning: repository is unrelated\n"
-msgstr ""
+msgid "file not found!"
+msgstr "file non trovato!"
 
-msgid "repository is unrelated"
-msgstr "il repository non è imparentato"
+msgid "no match under directory!"
+msgstr "nessuna corrispondenza sotto la directory!"
 
-msgid "requesting all changes\n"
-msgstr "sto richiedendo tutte le modifiche\n"
+msgid "file not tracked!"
+msgstr "file non tracciato!"
 
-msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset."
+msgid "unresolved merge conflicts (see hg resolve)"
 msgstr ""
 
+#, python-format
+msgid "committing subrepository %s\n"
+msgstr "commit del subrepository %s\n"
+
 #, fuzzy, python-format
-msgid "abort: push creates new remote branch '%s'!\n"
-msgstr "abortito: push crea nuove head remote!\n"
+msgid "note: commit message saved in %s\n"
+msgstr "modifica il messaggio di commit"
 
-msgid "abort: push creates new remote heads!\n"
-msgstr "abortito: push crea nuove head remote!\n"
+#, python-format
+msgid "trouble committing %s!\n"
+msgstr ""
 
-msgid "(did you forget to merge? use push -f to force)\n"
-msgstr "(ti sei dimenticato di effettuare il merge? usare push -f per forzare)\n"
+msgid "requesting all changes\n"
+msgstr "sto richiedendo tutte le modifiche\n"
 
-msgid "note: unsynced remote changes!\n"
-msgstr "nota: modifiche remote non sincronizzate!\n"
+msgid ""
+"Partial pull cannot be done because other repository doesn't support "
+"changegroupsubset."
+msgstr ""
 
 #, python-format
 msgid "%d changesets found\n"
 msgstr "%d changeset trovati\n"
 
+#, fuzzy
+msgid "bundling changes"
+msgstr "sto aggiungendo i changeset\n"
+
+msgid "chunks"
+msgstr ""
+
+#, fuzzy
+msgid "bundling manifests"
+msgstr "sto aggiungendo i manifesti\n"
+
 #, python-format
 msgid "empty or missing revlog for %s"
 msgstr "revlog vuoto o mancante per %s"
 
+#, fuzzy
+msgid "bundling files"
+msgstr "sto annullando la rimozione di %s\n"
+
 msgid "adding changesets\n"
 msgstr "sto aggiungendo i changeset\n"
 
+#, fuzzy
+msgid "changesets"
+msgstr "sto aggiungendo i changeset\n"
+
 msgid "received changelog group is empty"
 msgstr "il gruppo di changelog ricevuto è vuoto"
 
 msgid "adding manifests\n"
 msgstr "sto aggiungendo i manifesti\n"
 
+#, fuzzy
+msgid "manifests"
+msgstr "sto aggiungendo i manifesti\n"
+
 msgid "adding file changes\n"
 msgstr "sto aggiungendo le modifiche ai file\n"
 
@@ -9304,6 +11995,10 @@
 msgstr "il gruppo di file revlog ricevuto è vuoto"
 
 #, python-format
+msgid "missing file data for %s:%s - run hg verify"
+msgstr ""
+
+#, python-format
 msgid " (%+d heads)"
 msgstr " (%+d head)"
 
@@ -9383,7 +12078,9 @@
 msgstr ""
 
 #, python-format
-msgid "untracked file in working directory differs from file in requested revision: '%s'"
+msgid ""
+"untracked file in working directory differs from file in requested revision: "
+"'%s'"
 msgstr ""
 
 #, python-format
@@ -9396,9 +12093,8 @@
 "(n)one, e(x)ec or sym(l)ink?"
 msgstr ""
 
-#, fuzzy
 msgid "&None"
-msgstr "fatto\n"
+msgstr ""
 
 msgid "E&xec"
 msgstr ""
@@ -9430,6 +12126,10 @@
 msgid "&Deleted"
 msgstr ""
 
+#, fuzzy
+msgid "updating"
+msgstr "sto aggiornando le tag\n"
+
 #, python-format
 msgid "update failed to remove %s: %s!\n"
 msgstr ""
@@ -9450,23 +12150,24 @@
 msgid "branch %s not found"
 msgstr "branch %s non trovata"
 
-msgid "can't merge with ancestor"
-msgstr "impossibile fare merge con un antenato"
+msgid "merging with a working directory ancestor has no effect"
+msgstr ""
 
 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
-msgstr "niente di cui effettuare il merge (usare 'hg update' ocontrollare 'hg heads')"
+msgstr ""
+"niente di cui effettuare il merge (usare 'hg update' ocontrollare 'hg heads')"
 
-#, fuzzy
 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
-msgstr "ci sono modifiche in sospeso di cui non si è effettuato il commit"
-
-msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
 msgstr ""
+"ci sono modifiche in sospeso di cui non si è effettuato il commit (usa'hg "
+"status' per elencarle)"
 
-msgid "crosses branches (use 'hg merge' or 'hg update -C')"
+msgid ""
+"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard "
+"changes)"
 msgstr ""
 
-msgid "crosses named branches (use 'hg update -C' to discard changes)"
+msgid "crosses branches (use 'hg merge' or use 'hg update -c')"
 msgstr ""
 
 #, python-format
@@ -9498,11 +12199,11 @@
 msgstr ""
 
 #, python-format
-msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
+msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"
 msgstr ""
 
 #, python-format
-msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
+msgid "Hunk #%d succeeded at %d (offset %d lines).\n"
 msgstr ""
 
 #, python-format
@@ -9525,7 +12226,7 @@
 msgstr ""
 
 #, python-format
-msgid "unable to strip away %d dirs from %s"
+msgid "unable to strip away %d of %d dirs from %s"
 msgstr ""
 
 msgid "undefined source and destination files"
@@ -9543,13 +12244,21 @@
 msgid "patch command failed: %s"
 msgstr "comando patch fallito: %s"
 
-#, fuzzy, python-format
+#, python-format
 msgid "Unsupported line endings type: %s"
-msgstr "%s: tipo di file non supportato (il tipo è %s)\n"
+msgstr "Tipo di fine linea non supportato: %s"
 
-#, fuzzy, python-format
+#, fuzzy
+msgid ""
+"internal patcher failed\n"
+"please report details to http://mercurial.selenic.com/bts/\n"
+"or mercurial@selenic.com\n"
+msgstr ""
+"** riportare dettagli del bug a http://www.selenic.com/mercurial/bts/\n"
+
+#, python-format
 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
-msgstr "%d file, %d changeset, %d revisioni totali\n"
+msgstr "%d file modificati, %d inserimenti(+), %d cancellazioni(-)\n"
 
 #, python-format
 msgid "exited with status %d"
@@ -9559,14 +12268,22 @@
 msgid "killed by signal %d"
 msgstr "ucciso dal segnale %d"
 
-#, python-format
-msgid "saving bundle to %s\n"
+#, fuzzy, python-format
+msgid "saved backup bundle to %s\n"
 msgstr "sto salvando il bundle in %s\n"
 
 msgid "adding branch\n"
 msgstr ""
 
 #, python-format
+msgid "strip failed, full bundle stored in '%s'\n"
+msgstr ""
+
+#, python-format
+msgid "strip failed, partial bundle stored in '%s'\n"
+msgstr ""
+
+#, python-format
 msgid "cannot %s; remote repository does not support the %r capability"
 msgstr "%s impossibile; il repository remoto non supporta la funzionalità %r"
 
@@ -9574,6 +12291,9 @@
 msgid "unknown compression type %r"
 msgstr ""
 
+msgid "index entry flags need RevlogNG"
+msgstr ""
+
 #, python-format
 msgid "index %s unknown flags %#04x for format v0"
 msgstr ""
@@ -9586,9 +12306,9 @@
 msgid "index %s unknown format %d"
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "index %s is corrupted"
-msgstr "interrotto"
+msgstr "l'indice %s è corrotto"
 
 msgid "no node"
 msgstr "nessun nodo"
@@ -9613,6 +12333,114 @@
 msgid "consistency error adding group"
 msgstr ""
 
+msgid "unterminated string"
+msgstr ""
+
+msgid "syntax error"
+msgstr ""
+
+msgid "missing argument"
+msgstr ""
+
+#, python-format
+msgid "can't use %s here"
+msgstr ""
+
+msgid "can't use a list in this context"
+msgstr ""
+
+#, python-format
+msgid "not a function: %s"
+msgstr ""
+
+msgid "limit wants two arguments"
+msgstr ""
+
+msgid "limit wants a number"
+msgstr ""
+
+msgid "limit expects a number"
+msgstr ""
+
+msgid "ancestor wants two arguments"
+msgstr ""
+
+msgid "ancestor arguments must be single revisions"
+msgstr ""
+
+msgid "follow takes no arguments"
+msgstr ""
+
+msgid "date wants a string"
+msgstr ""
+
+msgid "keyword wants a string"
+msgstr ""
+
+msgid "grep wants a string"
+msgstr ""
+
+msgid "author wants a string"
+msgstr ""
+
+msgid "file wants a pattern"
+msgstr ""
+
+msgid "contains wants a pattern"
+msgstr ""
+
+msgid "modifies wants a pattern"
+msgstr ""
+
+msgid "adds wants a pattern"
+msgstr ""
+
+msgid "removes wants a pattern"
+msgstr ""
+
+msgid "merge takes no arguments"
+msgstr ""
+
+msgid "closed takes no arguments"
+msgstr ""
+
+msgid "head takes no arguments"
+msgstr ""
+
+msgid "sort wants one or two arguments"
+msgstr ""
+
+msgid "sort spec must be a string"
+msgstr ""
+
+#, python-format
+msgid "unknown sort key %r"
+msgstr "chiave di ordinamento sconosciuta: %r"
+
+msgid "all takes no arguments"
+msgstr ""
+
+msgid "outgoing wants a repository path"
+msgstr ""
+
+msgid "tagged takes no arguments"
+msgstr ""
+
+msgid "can't negate that"
+msgstr ""
+
+msgid "not a symbol"
+msgstr ""
+
+msgid "empty query"
+msgstr ""
+
+msgid "searching for exact renames"
+msgstr ""
+
+msgid "searching for similar files"
+msgstr ""
+
 #, python-format
 msgid "%s looks like a binary file."
 msgstr ""
@@ -9633,9 +12461,6 @@
 msgid "no suitable response from remote hg"
 msgstr "nessuna risposta accettabile dall'hg remoto"
 
-msgid "remote: "
-msgstr "remoto: "
-
 #, python-format
 msgid "push refused: %s"
 msgstr "push rifiutato: %s"
@@ -9643,6 +12468,10 @@
 msgid "unsynced changes"
 msgstr "modifiche non sincronizzate"
 
+#, python-format
+msgid "'%s' does not appear to be an hg repository"
+msgstr "'%s' non sembra essere un repository hg"
+
 msgid "cannot lock static-http repository"
 msgstr "impossibile bloccare il repository http statico"
 
@@ -9653,15 +12482,22 @@
 msgid "invalid entry in fncache, line %s"
 msgstr "voce non valida in fncache, linea %s"
 
+#, fuzzy, python-format
+msgid "subrepo spec file %s not found"
+msgstr "repository %s non trovato"
+
+#, fuzzy
+msgid "missing ] in subrepo source"
+msgstr "sto effettuando il push del subrepository %s\n"
+
 #, python-format
 msgid ""
 " subrepository sources for %s differ\n"
 "use (l)ocal source (%s) or (r)emote source (%s)?"
 msgstr ""
 
-#, fuzzy
 msgid "&Remote"
-msgstr "remoto: "
+msgstr "&Remoto"
 
 #, python-format
 msgid ""
@@ -9676,16 +12512,28 @@
 msgstr ""
 
 #, fuzzy, python-format
+msgid "unknown subrepo type %s"
+msgstr "modalità di ordinamento sconosciuta: %s"
+
+#, python-format
 msgid "removing subrepo %s\n"
-msgstr "sto rimuovendo %s\n"
+msgstr "sto rimuovendo il subrepository %s\n"
 
 #, fuzzy, python-format
-msgid "pulling subrepo %s\n"
-msgstr "sto facendo pull da %s\n"
+msgid "pulling subrepo %s from %s\n"
+msgstr "sto effettuando il pull del subrepository %s\n"
 
 #, fuzzy, python-format
-msgid "pushing subrepo %s\n"
-msgstr "sto effettuando il push verso %s\n"
+msgid "pushing subrepo %s to %s\n"
+msgstr "sto effettuando il push del subrepository %s\n"
+
+#, fuzzy
+msgid "cannot commit svn externals"
+msgstr "impossibile effettuare commit su una patch mq applicata"
+
+#, fuzzy, python-format
+msgid "not removing repo %s because it has changes.\n"
+msgstr "non rimuovo %s: file %s (usare -f per forzare la rimozione)\n"
 
 #, python-format
 msgid "%s, line %s: %s\n"
@@ -9701,13 +12549,13 @@
 msgid "unmatched quotes"
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "error expanding '%s%%%s'"
-msgstr "errore di lettura di %s/.hg/hgrc: %s\n"
+msgstr "errore nell'espansione di '%s%%%s'"
 
-#, fuzzy, python-format
+#, python-format
 msgid "unknown filter '%s'"
-msgstr "revisione sconosciuta '%s'"
+msgstr "filtro sconosciuto '%s'"
 
 #, python-format
 msgid "style not found: %s"
@@ -9730,9 +12578,8 @@
 msgid "rollback completed\n"
 msgstr "rollback completato\n"
 
-#, fuzzy
 msgid "rollback failed - please run hg recover\n"
-msgstr "il journal esiste già - eseguire hg recover"
+msgstr "rollback fallito - eseguire hg recover\n"
 
 #, python-format
 msgid "Not trusting file %s from untrusted user %s, group %s\n"
@@ -9742,9 +12589,9 @@
 msgid "Ignored: %s\n"
 msgstr "Ignorato: %s\n"
 
-#, fuzzy, python-format
+#, python-format
 msgid "ignoring untrusted configuration option %s.%s = %s\n"
-msgstr "Ignoro l'opzione di configurazione non affidabile %s.%s = %s\n"
+msgstr "ignoro l'opzione di configurazione non affidabile %s.%s = %s\n"
 
 #, python-format
 msgid "%s.%s not a boolean ('%s')"
@@ -9757,13 +12604,17 @@
 msgid "No username found, using '%s' instead\n"
 msgstr "Nessuno username trovato, uso '%s' invece\n"
 
-msgid "Please specify a username."
-msgstr "Si prega di specificare uno username."
+msgid "no username supplied (see \"hg help config\")"
+msgstr ""
 
 #, python-format
 msgid "username %s contains a newline\n"
 msgstr "lo username %s contiene un carattere di fine riga\n"
 
+#, python-format
+msgid "(deprecated '%%' in path %s=%s from %s)\n"
+msgstr ""
+
 msgid "response expected"
 msgstr "risposta attesa"
 
@@ -9798,6 +12649,16 @@
 msgstr "autenticazione http: utente %s, password %s\n"
 
 #, python-format
+msgid "ignoring invalid [auth] key '%s'\n"
+msgstr ""
+
+msgid "certificate checking requires Python 2.6"
+msgstr ""
+
+msgid "server identity verification succeeded\n"
+msgstr ""
+
+#, python-format
 msgid "command '%s' failed: %s"
 msgstr "comando '%s' fallito: %s"
 
@@ -9807,7 +12668,7 @@
 
 #, python-format
 msgid "path %r is inside repo %r"
-msgstr "il percorso %r  all'interno del repository %r"
+msgstr "il percorso %r è all'interno del repository %r"
 
 #, python-format
 msgid "path %r traverses symbolic link %r"
@@ -9902,13 +12763,13 @@
 msgid "warning: `%s' uses revlog format 0"
 msgstr "attenzione: `%s' usa il formato di revlog 0"
 
-#, fuzzy, python-format
+#, python-format
 msgid "rev %d points to nonexistent changeset %d"
-msgstr "rev %d punta a %s changeset %d"
+msgstr "rev %d punta al changeset non esistente %d"
 
-#, fuzzy, python-format
+#, python-format
 msgid "rev %d points to unexpected changeset %d"
-msgstr "rev %d punta a %s changeset %d"
+msgstr "rev %d punta al changeset inatteso %d"
 
 #, python-format
 msgid " (expected %s)"
@@ -9930,6 +12791,9 @@
 msgid "duplicate revision %d (%d)"
 msgstr "revisione duplicata %d (%d)"
 
+msgid "abandoned transaction found - run hg recover\n"
+msgstr ""
+
 #, python-format
 msgid "repository uses revlog format %d\n"
 msgstr "il repository usa il formato di revlog %d\n"
@@ -9944,9 +12808,9 @@
 msgid "checking manifests\n"
 msgstr "sto controllando i manifesti\n"
 
-#, fuzzy, python-format
+#, python-format
 msgid "%s not in changesets"
-msgstr "%s non è nei manifesti"
+msgstr "%s non è nei changeset"
 
 msgid "file without name in manifest"
 msgstr "file senza nome nel manifesto"
@@ -9956,7 +12820,11 @@
 msgstr "sto leggendo il delta del manifesto %s"
 
 msgid "crosschecking files in changesets and manifests\n"
-msgstr "sto facendo un controllo incrociato sui file nei changeset e nei manifesti\n"
+msgstr ""
+"sto facendo un controllo incrociato sui file nei changeset e nei manifesti\n"
+
+msgid "crosschecking"
+msgstr ""
 
 #, python-format
 msgid "changeset refers to unknown manifest %s"
@@ -9975,6 +12843,10 @@
 msgid "cannot decode filename '%s'"
 msgstr "impossibile decodificare il nome del file '%s'"
 
+#, fuzzy
+msgid "checking"
+msgstr "sto controllando i file\n"
+
 #, python-format
 msgid "broken revlog! (%s)"
 msgstr "revlog danneggiato! (%s)"
@@ -10035,4 +12907,187 @@
 msgstr "(il primo changeset danneggiato sembra essere %d)\n"
 
 msgid "user name not available - set USERNAME environment variable"
-msgstr "nome utente non disponibile - impostare la variabile d'ambiente USERNAME"
+msgstr ""
+"nome utente non disponibile - impostare la variabile d'ambiente USERNAME"
+
+#~ msgid "COMMANDS"
+#~ msgstr "COMANDI"
+
+#~ msgid "generating stats: %d%%"
+#~ msgstr "sto generando le statistiche: %d%%"
+
+#~ msgid "show progress"
+#~ msgstr "mostra progresso"
+
+#~ msgid "don't colorize output (DEPRECATED)"
+#~ msgstr "non colorare l'output (DEPRECATO)"
+
+#~ msgid "no tags found at revision %d\n"
+#~ msgstr "nessuna tag trovata alla revisione %d\n"
+
+#, fuzzy
+#~ msgid "show keyword status flags of all files (DEPRECATED)"
+#~ msgstr "mostra lo stato di tutti i file"
+
+#~ msgid ""
+#~ "\n"
+#~ "imported patch %s"
+#~ msgstr ""
+#~ "\n"
+#~ "patch %s importata"
+
+#~ msgid "force removal with local changes"
+#~ msgstr "forza la rimozione con modifiche locali"
+
+#~ msgid "rebase from a given revision"
+#~ msgstr "rebase da una data revisione"
+
+#~ msgid "rebase from the base of a given revision"
+#~ msgstr "rebase dalla base di una data revisione"
+
+#~ msgid "rebase onto a given revision"
+#~ msgstr "rebase su una data revisione"
+
+#~ msgid "y - record this change"
+#~ msgstr "y - registra questa modifica"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "    This is the symmetrical operation for pull. It moves changes from\n"
+#~ "    the current repository to a different one. If the destination is\n"
+#~ "    local this is identical to a pull in that directory from the\n"
+#~ "    current one."
+#~ msgstr ""
+#~ "    Questa è l'operazione simmetrica di pull. Aiuta a spostare modifiche\n"
+#~ "    dal repository corrente in un altro. Se la destinazione è locale "
+#~ "questo\n"
+#~ "    è identico ad un pull in quella directory verso questa."
+
+#, fuzzy
+#~ msgid ""
+#~ "    By default, push will refuse to run if it detects the result would\n"
+#~ "    increase the number of remote heads. This generally indicates the\n"
+#~ "    user forgot to pull and merge before pushing."
+#~ msgstr ""
+#~ "    Di default, il push verrà rifiutato se viene rivelato che aumenterà "
+#~ "il\n"
+#~ "    numerdo di head remote. Questo generalmente indica che il client ha\n"
+#~ "    dimenticato di fare pull e merge prima del push."
+
+#, fuzzy
+#~ msgid ""
+#~ "    (Use update -r to check out earlier revisions, revert does not\n"
+#~ "    change the working directory parents.)"
+#~ msgstr ""
+#~ "    (usare update -r per effettuare il checkout di revisioni\n"
+#~ "    precedenti, revert non cambia i genitori della directory di\n"
+#~ "    lavoro)"
+
+#, fuzzy
+#~ msgid "export the repository via HTTP"
+#~ msgstr "esporta il repository via HTTP"
+
+#, fuzzy
+#~ msgid "    Start a local HTTP repository browser and pull server."
+#~ msgstr "    Avvia un server HTTP locale per il pull e la navigazione."
+
+#, fuzzy
+#~ msgid ""
+#~ "    Update the repository's working directory to the specified\n"
+#~ "    revision, or the tip of the current branch if none is specified.\n"
+#~ "    Use null as the revision to remove the working copy (like 'hg\n"
+#~ "    clone -U')."
+#~ msgstr ""
+#~ "    Aggiorna la directory di lavoro del repository ad una revisione\n"
+#~ "    specifica, o al tip della branch corrente se nessuna è stata\n"
+#~ "    specificata. Usare null come revisione per rimuovere la copia di\n"
+#~ "    lavoro (come 'hg clone -U')."
+
+#, fuzzy
+#~ msgid ""
+#~ "    When the working directory contains no uncommitted changes, it\n"
+#~ "    will be replaced by the state of the requested revision from the\n"
+#~ "    repository. When the requested revision is on a different branch,\n"
+#~ "    the working directory will additionally be switched to that\n"
+#~ "    branch."
+#~ msgstr ""
+#~ "    Quando la directory di lavoro non contiene modifiche di cui non si\n"
+#~ "    è eseguito il commit, sarà rimpiazzata dallo stato della revisione\n"
+#~ "    richiesta dal repository. Quando la revisione richiesta è su una\n"
+#~ "    branch differente, la directory di lavoro verrà inoltre spostata\n"
+#~ "    su quella branch."
+
+#, fuzzy
+#~ msgid ""
+#~ "    When there are uncommitted changes, use option -C/--clean to\n"
+#~ "    discard them, forcibly replacing the state of the working\n"
+#~ "    directory with the requested revision. Alternately, use -c/--check\n"
+#~ "    to abort."
+#~ msgstr ""
+#~ "    Quandi ci sono modifiche di cui non si è eseguito il commit, usare\n"
+#~ "    l'opzione -C per scartarle, forzando la sostituzione dello stato\n"
+#~ "    della directory di lavoro con la revisione richiesta."
+
+#, fuzzy
+#~ msgid ""
+#~ "    When there are uncommitted changes and option -C/--clean is not\n"
+#~ "    used, and the parent revision and requested revision are on the\n"
+#~ "    same branch, and one of them is an ancestor of the other, then the\n"
+#~ "    new working directory will contain the requested revision merged\n"
+#~ "    with the uncommitted changes. Otherwise, the update will fail with\n"
+#~ "    a suggestion to use 'merge' or 'update -C' instead."
+#~ msgstr ""
+#~ "    Quando ci sono modifiche di cui non si è eseguito il commit,\n"
+#~ "    l'opzione -C non è usata, la revisione del genitore e di quella\n"
+#~ "    richiesta sono sulla stessa branch e una di queste è un antenato\n"
+#~ "    dell'altro, allora la nuova directory di lavoro conterrà la\n"
+#~ "    revisione richiesta unita con le modifiche non salvate. Altrimenti\n"
+#~ "    l'aggiornamento fallirà con un suggerimento di usare invece\n"
+#~ "    'merge' o 'update -C'."
+
+#~ msgid "a changeset up to which you would like to bundle"
+#~ msgstr "un changeset fino al quale si desidera effettuare il bundle"
+
+#~ msgid "a changeset you would like to have after cloning"
+#~ msgstr "un changeset che si desidera avere dopo il clone"
+
+#, fuzzy
+#~ msgid "show only the active branch heads from open branches"
+#~ msgstr "mostra solo le head attive dalle branch aperte"
+
+#, fuzzy
+#~ msgid "[-r STARTREV] [REV]..."
+#~ msgstr "[-r REV] [REV]..."
+
+#~ msgid "a specific revision up to which you would like to pull"
+#~ msgstr "una specifica revisione fino alla quale si desidera fare il pull"
+
+#~ msgid "a specific revision up to which you would like to push"
+#~ msgstr ""
+#~ "una specifica revisione fino alla quale si desidera effettuare il push"
+
+#~ msgid "revision to revert to"
+#~ msgstr "revisione a cui annullare"
+
+#~ msgid "overwrite locally modified files (no backup)"
+#~ msgstr "sovrascrivi file modificati localmente (nessun backup)"
+
+#~ msgid "abort: could not import module %s!\n"
+#~ msgstr "abortito: non è stato possibile importare %s!\n"
+
+#~ msgid "journal already exists - run hg recover"
+#~ msgstr "il journal esiste già - eseguire hg recover"
+
+#~ msgid ""
+#~ "%s: files over 10MB may cause memory and performance problems\n"
+#~ "(use 'hg revert %s' to unadd the file)\n"
+#~ msgstr ""
+#~ "%s: file oltre i 10MB potrebbero causare problemi di memoria\n"
+#~ "e performance (usare 'hg revert %s' per annullare l'aggiunta\n"
+#~ "del file)\n"
diff -Nru mercurial-1.6.2/i18n/ja.po mercurial-1.6.4/i18n/ja.po
--- mercurial-1.6.2/i18n/ja.po	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/i18n/ja.po	2010-10-01 15:18:50.000000000 +0000
@@ -99,7 +99,7 @@
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-28 11:35+0900\n"
+"POT-Creation-Date: 2010-10-01 16:57+0900\n"
 "PO-Revision-Date: 2009-11-16 21:24+0100\n"
 "Last-Translator: Japanese translation team \n"
 "Language-Team: Japanese\n"
@@ -127,13 +127,16 @@
 msgstr "    別名: %s"
 
 msgid "hooks for controlling repository access"
-msgstr ""
+msgstr "リポジトリにおけるアクセス制御用のフック集"
 
 msgid ""
 "This hook makes it possible to allow or deny write access to given\n"
 "branches and paths of a repository when receiving incoming changesets\n"
 "via pretxnchangegroup and pretxncommit."
 msgstr ""
+"アクセス制御用フックを使用することで、pretxnchangegroup や pretxncommit\n"
+"契機で更新反映を受理した際に、指定されたブランチやパスに対して、\n"
+"書き込みの可否を制御できます。"
 
 msgid ""
 "The authorization is matched based on the local user name on the\n"
@@ -381,7 +384,7 @@
 "By default, when several bookmarks point to the same changeset, they\n"
 "will all move forward together. It is possible to obtain a more\n"
 "git-like experience by adding the following configuration option to\n"
-"your .hgrc::"
+"your configuration file::"
 msgstr ""
 
 msgid ""
@@ -425,6 +428,9 @@
 msgid "bookmark name cannot contain newlines"
 msgstr "ブックマーク名に改行を含めません"
 
+msgid "bookmark names cannot consist entirely of whitespace"
+msgstr "空白文字だけで構成されたタグ名は不正です"
+
 msgid "a bookmark cannot have the name of an existing branch"
 msgstr "既存ブランチと同名のブックマークは作成できません"
 
@@ -459,6 +465,10 @@
 msgid "deleting remote bookmark %s\n"
 msgstr "連携先のブックマーク %s の削除中\n"
 
+#, python-format
+msgid "bookmark %s does not exist on the local or remote repository!\n"
+msgstr ""
+
 msgid "searching for changes\n"
 msgstr "変更点を探索中\n"
 
@@ -883,6 +893,10 @@
 "    直下にある .hgchurn というファイルを読み込もうとします。\n"
 "    "
 
+#, python-format
+msgid "skipping malformed alias: %s\n"
+msgstr "不正な形式のエイリアスは無視します: %s\n"
+
 msgid "count rate for the specified revision or range"
 msgstr "処理対象とする特定リビジョン／範囲の指定"
 
@@ -923,7 +937,7 @@
 msgstr "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]"
 
 msgid "colorize output from some commands"
-msgstr ""
+msgstr "コマンド出力のカラー化"
 
 msgid ""
 "This extension modifies the status and resolve commands to add color to "
@@ -941,7 +955,7 @@
 "render_text function, which can be used to add effects to any text."
 msgstr ""
 
-msgid "Default effects may be overridden from the .hgrc file::"
+msgid "Default effects may be overridden from your configuration file::"
 msgstr ""
 
 msgid ""
@@ -1049,7 +1063,7 @@
 
 msgid ""
 "    If no destination directory name is specified, it defaults to the\n"
-"    basename of the source with '-hg' appended. If the destination\n"
+"    basename of the source with ``-hg`` appended. If the destination\n"
 "    repository doesn't exist, it will be created."
 msgstr ""
 
@@ -1089,41 +1103,53 @@
 
 msgid ""
 "    If the file doesn't exist, it's automatically created. It's\n"
-"    updated on each commit copied, so convert-repo can be interrupted\n"
+"    updated on each commit copied, so :hg:`convert` can be interrupted\n"
 "    and can be run repeatedly to copy new commits."
 msgstr ""
 
 msgid ""
-"    The [username mapping] file is a simple text file that maps each\n"
+"    The username mapping file is a simple text file that maps each\n"
 "    source commit author to a destination commit author. It is handy\n"
 "    for source SCMs that use unix logins to identify authors (eg:\n"
-"    CVS). One line per author mapping and the line format is:\n"
-"    srcauthor=whatever string you want"
+"    CVS). One line per author mapping and the line format is::"
+msgstr ""
+
+msgid "      source author = destination author"
+msgstr ""
+
+msgid "    Empty lines and lines starting with a ``#`` are ignored."
 msgstr ""
 
 msgid ""
 "    The filemap is a file that allows filtering and remapping of files\n"
-"    and directories. Comment lines start with '#'. Each line can\n"
-"    contain one of the following directives::"
+"    and directories. Each line can contain one of the following\n"
+"    directives::"
 msgstr ""
 
-msgid "      include path/to/file"
+msgid "      include path/to/file-or-dir"
 msgstr ""
 
-msgid "      exclude path/to/file"
+msgid "      exclude path/to/file-or-dir"
 msgstr ""
 
-msgid "      rename from/file to/file"
+msgid "      rename path/to/source path/to/destination"
 msgstr ""
 
 msgid ""
-"    The 'include' directive causes a file, or all files under a\n"
+"    Comment lines start with ``#``. A specificed path matches if it\n"
+"    equals the full relative name of a file or one of its parent\n"
+"    directories. The ``include`` or ``exclude`` directive with the\n"
+"    longest matching path applies, so line order does not matter."
+msgstr ""
+
+msgid ""
+"    The ``include`` directive causes a file, or all files under a\n"
 "    directory, to be included in the destination repository, and the\n"
 "    exclusion of all other files and directories not explicitly\n"
-"    included. The 'exclude' directive causes files or directories to\n"
-"    be omitted. The 'rename' directive renames a file or directory. To\n"
-"    rename from a subdirectory into the root of the repository, use\n"
-"    '.' as the path to rename to."
+"    included. The ``exclude`` directive causes files or directories to\n"
+"    be omitted. The ``rename`` directive renames a file or directory if\n"
+"    is converted. To rename from a subdirectory into the root of the\n"
+"    repository, use ``.`` as the path to rename to."
 msgstr ""
 
 msgid ""
@@ -1132,7 +1158,14 @@
 "    useful if you want to e.g. give a Subversion merge two parents, or\n"
 "    graft two disconnected series of history together. Each entry\n"
 "    contains a key, followed by a space, followed by one or two\n"
-"    comma-separated values. The key is the revision ID in the source\n"
+"    comma-separated values::"
+msgstr ""
+
+msgid "      key parent1, parent2"
+msgstr ""
+
+msgid ""
+"    The key is the revision ID in the source\n"
 "    revision control system whose parents should be modified (same\n"
 "    format as a key in .hg/shamap). The values are the revision IDs\n"
 "    (in either the source or destination revision control system) that\n"
@@ -1148,11 +1181,18 @@
 "    conjunction with a splicemap, it allows for a powerful combination\n"
 "    to help fix even the most badly mismanaged repositories and turn them\n"
 "    into nicely structured Mercurial repositories. The branchmap contains\n"
-"    lines of the form \"original_branch_name new_branch_name\".\n"
-"    \"original_branch_name\" is the name of the branch in the source\n"
-"    repository, and \"new_branch_name\" is the name of the branch is the\n"
-"    destination repository. This can be used to (for instance) move code\n"
-"    in one repository from \"default\" to a named branch."
+"    lines of the form::"
+msgstr ""
+
+msgid "      original_branch_name new_branch_name"
+msgstr ""
+
+msgid ""
+"    where \"original_branch_name\" is the name of the branch in the\n"
+"    source repository, and \"new_branch_name\" is the name of the branch\n"
+"    is the destination repository. No whitespace is allowed in the\n"
+"    branch names. This can be used to (for instance) move code in one\n"
+"    repository from \"default\" to a named branch."
 msgstr ""
 
 msgid ""
@@ -1458,8 +1498,8 @@
 msgid "%s: unknown repository type"
 msgstr "%s: 未知のリポジトリ形式"
 
-msgid "retrieving file"
-msgstr "ファイルの回収中"
+msgid "getting files"
+msgstr "ファイルの取得中"
 
 msgid "revisions"
 msgstr "リビジョン"
@@ -1633,6 +1673,13 @@
 msgid "Python ElementTree module is not available"
 msgstr "Python の ElementTree モジュールが利用できません"
 
+#, python-format
+msgid "%s repository format is unsupported, please upgrade"
+msgstr ""
+
+msgid "failed to detect repository format!"
+msgstr "リポジトリ形式の判定に失敗!"
+
 msgid "internal calling inconsistency"
 msgstr "内部不整合"
 
@@ -1829,11 +1876,11 @@
 msgid "unable to cope with svn output"
 msgstr "予期せぬ svn 出力のため継続できません"
 
-msgid "XXX TAGS NOT IMPLEMENTED YET\n"
-msgstr "XXX タグ付けはまだ実装されていません\n"
+msgid "writing Subversion tags is not yet implemented\n"
+msgstr ""
 
 msgid "automatically manage newlines in repository files"
-msgstr ""
+msgstr "管理対象ファイルにおける改行形式の自動管理"
 
 msgid ""
 "This extension allows you to manage the type of line endings (CRLF or\n"
@@ -2098,7 +2145,7 @@
 msgstr "pull, update, merge の一括実行"
 
 msgid "pull changes from a remote repository, merge new changes if needed."
-msgstr ""
+msgstr "遠隔リポジトリからの取り込みと、必要におうじたマージ実施"
 
 msgid ""
 "    This finds all changes from the repository at the specified path\n"
@@ -2128,9 +2175,7 @@
 
 msgid ""
 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
-msgstr ""
-"作業領域はブランチ tip ではありません(\"hg update\" でブランチ tip に更新可"
-"能)"
+msgstr "作業領域はブランチの最新ではありません(:hg:`update` で最新に更新可能)"
 
 msgid "outstanding uncommitted merge"
 msgstr "マージが未コミットです"
@@ -2144,8 +2189,7 @@
 msgid ""
 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
 msgstr ""
-"このブランチには複数のヘッドがあります(\"hg heads .\" と \"hg merge\" でマー"
-"ジしてください)"
+"ブランチに複数のヘッドがあります(:hg:`heads .` で確認、:hg:`merge` でマージ)"
 
 #, python-format
 msgid "pulling from %s\n"
@@ -2161,8 +2205,7 @@
 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
 "\" to merge them)\n"
 msgstr ""
-"%d 個の新規ブランチヘッドとはマージされません(\"hg heads .\" と \"hg merge\" "
-"でマージしてください)\n"
+"新規ヘッド %d 個はマージ未実施(:hg:`heads .` で確認、:hg:`merge` でマージ)\n"
 
 #, python-format
 msgid "updating to %d:%s\n"
@@ -2224,7 +2267,7 @@
 msgstr "%s の正しい署名ではありません\n"
 
 msgid "add a signature for the current or given revision"
-msgstr ""
+msgstr "指定リビジョンへの署名の付与"
 
 msgid ""
 "    If no revision is given, the parent of the working directory is used,\n"
@@ -2238,15 +2281,14 @@
 msgid "Signing %d:%s\n"
 msgstr "%d:%s への署名中\n"
 
-msgid "Error while signing"
+msgid "error while signing"
 msgstr "署名処理の失敗"
 
 msgid ""
 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
 "force)"
 msgstr ""
-"作業領域の .hgsigs は変更されています(.hgsigs を手動コミットするか、--force "
-"を使用してください)"
+"作業領域の .hgsigs は変更されています(手動コミットないし --force の指定)"
 
 msgid "unknown signature version"
 msgstr "未知の署名バージョン"
@@ -2332,7 +2374,7 @@
 msgstr "hg glog [OPTION]... [FILE]"
 
 msgid "hooks for integrating with the CIA.vc notification service"
-msgstr ""
+msgstr "CIA.vc 通知サービスとの統合向けのフック集"
 
 msgid ""
 "This is meant to be run as a changegroup or incoming hook. To\n"
@@ -2387,7 +2429,7 @@
 msgstr "電子メール送信のためには email.from の定義が必要です"
 
 msgid "browse the repository in a graphical way"
-msgstr ""
+msgstr "グラフィカルな UI によるリポジトリ参照"
 
 msgid ""
 "The hgk extension allows browsing the history of a repository in a\n"
@@ -2406,7 +2448,7 @@
 msgid ""
 "The :hg:`view` command will launch the hgk Tcl script. For this command\n"
 "to work, hgk must be in your search path. Alternately, you can specify\n"
-"the path to hgk in your .hgrc file::"
+"the path to hgk in your configuration file::"
 msgstr ""
 
 msgid ""
@@ -2511,7 +2553,7 @@
 msgstr "hg debug-rev-list [OPTION]... REV..."
 
 msgid "syntax highlighting for hgweb (requires Pygments)"
-msgstr ""
+msgstr "hgweb におけるシンタックスハイライトの実施(要 Pygments)"
 
 msgid ""
 "It depends on the Pygments syntax highlighting library:\n"
@@ -2751,6 +2793,11 @@
 "現行ユーザやアーカイブ配布者に配慮しています。"
 
 msgid ""
+"Keywords expand to the changeset data pertaining to the latest change\n"
+"relative to the working directory parent of each file."
+msgstr ""
+
+msgid ""
 "Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n"
 "sections of hgrc files."
 msgstr ""
@@ -3306,9 +3353,8 @@
 msgid "patch series already fully applied\n"
 msgstr "全てのパッチが適用中です\n"
 
-#, python-format
-msgid "patch '%s' not found"
-msgstr "パッチ `%s` はありません"
+msgid "please specify the patch to move"
+msgstr "移動するパッチを指定してください"
 
 msgid "cleaning up working directory..."
 msgstr "作業領域の整理中..."
@@ -3448,6 +3494,10 @@
 msgstr "標準入力(-)からの取り込みの際には --name 指定が必要です"
 
 #, python-format
+msgid "unable to read file %s"
+msgstr "ファイル %s が読み込めません"
+
+#, python-format
 msgid "adding %s to series file\n"
 msgstr "パッチ %s を追加中\n"
 
@@ -3762,9 +3812,6 @@
 msgid "qfold requires at least one patch name"
 msgstr "統合実施には最低1つのパッチ名指定が必要です"
 
-msgid "No patches applied"
-msgstr "適用中のパッチはありません"
-
 #, python-format
 msgid "Skipping already folded patch %s"
 msgstr "既に統合済みのパッチ %s は無視します"
@@ -3774,7 +3821,7 @@
 msgstr "パッチ %s は適用中なので統合できません"
 
 #, python-format
-msgid "Error folding patch %s"
+msgid "error folding patch %s"
 msgstr "パッチ %s の統合に失敗"
 
 msgid "push or pop patches until named patch is at top of stack"
@@ -3891,8 +3938,8 @@
 msgid "restore the queue state saved by a revision (DEPRECATED)"
 msgstr "指定リビジョンによって保存されたパッチ管理状態の復旧(非推奨)"
 
-msgid "    This command is deprecated, use rebase --mq instead."
-msgstr "    本コマンドは非推奨です。--mq 指定によるリベースをしてください。"
+msgid "    This command is deprecated, use :hg:`rebase` instead."
+msgstr "    本コマンドは非推奨です。:hg:`rebase` を使用してください。"
 
 msgid "save current queue state (DEPRECATED)"
 msgstr "パッチ管理状態の保存(非推奨)"
@@ -4179,7 +4226,7 @@
 msgid "only a local queue repository may be initialized"
 msgstr "手元のキューのリポジトリしか初期化できません"
 
-msgid "There is no Mercurial repository here (.hg not found)"
+msgid "there is no Mercurial repository here (.hg not found)"
 msgstr "Mercurial リポジトリが見つかりません(.hg が不在です)"
 
 msgid "no queue repository"
@@ -4352,8 +4399,8 @@
 msgid "reorder patch series and apply only the patch"
 msgstr "パッチ一覧の順序変更とパッチ適用"
 
-msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]"
-msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]"
+msgid "hg qpush [-f] [-l] [-a] [-n NAME] [--move] [PATCH | INDEX]"
+msgstr "hg qpush [-f] [-l] [-a] [-n NAME] [--move] [PATCH | INDEX]"
 
 msgid "refresh only files already in the patch and specified files"
 msgstr "パッチ対象か、明示指定のあったファイルのみを処理対象にする"
@@ -4430,8 +4477,7 @@
 "bundle only changesets with local revision number greater than REV which are "
 "not descendants of REV (DEPRECATED)"
 msgstr ""
-"指定リビジョンより大きなリビジョン番号のもので、子孫以外を bundleファイル化 "
-"(非推奨)"
+"指定リビジョンよりリビジョン番号が大きく子孫以外のものを bundle 化(非推奨)"
 
 msgid "no backups"
 msgstr "バックアップ作成の抑止"
@@ -4467,7 +4513,7 @@
 msgstr "[OPTION] [QUEUE]"
 
 msgid "hooks for sending email notifications at commit/push time"
-msgstr ""
+msgstr "commit/push 契機でのメール通知用フック集"
 
 msgid ""
 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
@@ -4582,7 +4628,7 @@
 msgstr "notify: マージ %d:%s の通知を抑止中\n"
 
 msgid "browse command output with an external pager"
-msgstr ""
+msgstr "コマンド出力に対する外部ページャーの使用"
 
 msgid "To set the pager that should be used, set the application variable::"
 msgstr ""
@@ -4637,11 +4683,11 @@
 
 msgid ""
 "To ignore global commands like :hg:`version` or :hg:`help`, you have\n"
-"to specify them in the global .hgrc\n"
+"to specify them in your user configuration file.\n"
 msgstr ""
 
 msgid "interpret suffixes to refer to ancestor revisions"
-msgstr ""
+msgstr "祖先リビジョン参照のための接尾辞の解釈"
 
 msgid ""
 "This extension allows you to use git-style suffixes to refer to the\n"
@@ -5029,7 +5075,7 @@
 msgstr "hg email [OPTION]... [DEST]...\""
 
 msgid "show progress bars for some actions"
-msgstr ""
+msgstr "処理における進捗状況表示"
 
 msgid ""
 "This extension uses the progress information logged by hg commands\n"
@@ -5065,7 +5111,7 @@
 msgstr "作業領域中の未登録ファイルを削除するコマンド"
 
 msgid "removes files not tracked by Mercurial"
-msgstr ""
+msgstr "Mercurial による管理対象ではないファイルの削除"
 
 msgid ""
 "    Delete files not known to Mercurial. This is useful to test local\n"
@@ -5492,7 +5538,7 @@
 msgstr "複製リポジトリ間でのハードリンクの再生成"
 
 msgid "recreate hardlinks between two repositories"
-msgstr ""
+msgstr "２つのリポジトリ間でのハードリンクの再生成"
 
 msgid ""
 "    When repositories are cloned locally, their data files will be\n"
@@ -5578,7 +5624,7 @@
 msgstr "[ORIGIN]"
 
 msgid "extend schemes with shortcuts to repository swarms"
-msgstr ""
+msgstr "連携先リポジトリ群に対する略記指定の拡張"
 
 msgid ""
 "This extension allows you to specify shortcuts for parent URLs with a\n"
@@ -5635,7 +5681,7 @@
 msgstr "複数作業領域による履歴情報領域の共有"
 
 msgid "create a new shared repository"
-msgstr "新規共有リポジトリの作成"
+msgstr "共有リポジトリの新規作成"
 
 msgid ""
 "    Initialize a new repository and working directory that shares its\n"
@@ -5705,8 +5751,8 @@
 msgid "%s: empty changeset"
 msgstr "%s: 空のチェンジセット"
 
-msgid "Fix up the merge and run hg transplant --continue"
-msgstr "衝突解消後に 'hg transplant --continue' してください"
+msgid "fix up the merge and run hg transplant --continue"
+msgstr "衝突解消後に :hg:`transplant --continue` してください"
 
 #, python-format
 msgid "%s transplanted as %s\n"
@@ -6078,14 +6124,14 @@
 msgstr ""
 
 msgid ""
-"Zeroconf enabled repositories will be announced in a network without\n"
+"Zeroconf-enabled repositories will be announced in a network without\n"
 "the need to configure a server or a service. They can be discovered\n"
 "without knowing their actual IP address."
 msgstr ""
 
 msgid ""
-"To allow other people to discover your repository using run \"hg serve\"\n"
-"in your repository::"
+"To allow other people to discover your repository using run\n"
+":hg:`serve` in your repository::"
 msgstr ""
 
 msgid ""
@@ -6094,7 +6140,8 @@
 msgstr ""
 
 msgid ""
-"You can discover zeroconf enabled repositories by running \"hg paths\"::"
+"You can discover Zeroconf-enabled repositories by running\n"
+":hg:`paths`::"
 msgstr ""
 
 msgid ""
@@ -6401,8 +6448,7 @@
 "         $ hg add\n"
 "         adding foo.c\n"
 "         $ hg status\n"
-"         A foo.c\n"
-"    "
+"         A foo.c"
 msgstr ""
 "         $ ls\n"
 "         foo.c\n"
@@ -6411,7 +6457,13 @@
 "         $ hg add\n"
 "         foo.c を追加登録中\n"
 "         $ hg status\n"
-"         A foo.c\n"
+"         A foo.c"
+
+msgid ""
+"    Returns 0 if all files are successfully added.\n"
+"    "
+msgstr ""
+"    全てのファイルの登録が成功した場合のコマンド終了値は 0 です。\n"
 "    "
 
 msgid "add all new files, delete all missing files"
@@ -6438,21 +6490,16 @@
 "    every added file and records those similar enough as renames. This\n"
 "    option takes a percentage between 0 (disabled) and 100 (files must\n"
 "    be identical) as its parameter. Detecting renamed files this way\n"
-"    can be expensive."
+"    can be expensive. After using this option, :hg:`status -C` can be\n"
+"    used to check which files were identified as moved or renamed."
 msgstr ""
 "    ファイルの改名を検知するには -s/--similarity を使用します。0 より\n"
 "    大きな値が指定された場合、追加・除外ファイルの全てが比較され、改名と\n"
 "    みなせるか否かが判定されます。このオプションには、0(改名比較無し)\n"
 "    から 100 (完全一致で判定)までの範囲でパーセンテージを指定します。\n"
-"    改名判定には実行時間を要する可能性があります。\n"
-"    "
-
-msgid ""
-"    Returns 0 if all files are successfully added.\n"
-"    "
-msgstr ""
-"    全てのファイルの登録が成功した場合のコマンド終了値は 0 です。\n"
-"    "
+"    改名判定には実行時間を要する可能性があります。このオプションの使用\n"
+"    後に、:hg:`status -C` を実施することで、移動／改名が検知された\n"
+"    ファイルを確認することができます。"
 
 msgid "similarity must be a number"
 msgstr "類似度は数値でなければなりません"
@@ -7049,11 +7096,14 @@
 "    指定しないでください。"
 
 msgid ""
-"    If no commit message is specified, the configured editor is\n"
-"    started to prompt you for a message."
-msgstr ""
-"    コミットメッセージが指定されない場合、設定に従ってメッセージ入力用の\n"
-"    プログラムが起動されます。"
+"    If no commit message is specified, Mercurial starts your\n"
+"    configured editor where you can enter a message. In case your\n"
+"    commit fails, you will find a backup of your message in\n"
+"    ``.hg/last-message.txt``."
+msgstr ""
+"    コミットメッセージが指定されない場合、メッセージ入力用のプログラムが\n"
+"    設定に従って起動されます。コミット処理が失敗した場合でも、\n"
+"    入力したメッセージは ``.hg/last-message.txt`` に保存されます。"
 
 msgid ""
 "    Returns 0 on success, 1 if nothing changed.\n"
@@ -7160,7 +7210,7 @@
 
 msgid ""
 "    All string valued-elements are either strictly alphanumeric, or must\n"
-"    be enclosed in double quotes (\"...\"), with \"\" as escape character."
+"    be enclosed in double quotes (\"...\"), with \"\\\" as escape character."
 msgstr ""
 
 msgid ""
@@ -7351,7 +7401,7 @@
 
 msgid ""
 " (Current patch tool may be incompatible with patch, or misconfigured. "
-"Please check your .hgrc file)\n"
+"Please check your configuration file)\n"
 msgstr " (ツールが未対応なパッチ形式か、設定ミスです。設定確認が必要です)\n"
 
 msgid ""
@@ -7367,7 +7417,7 @@
 msgid " No commit editor set and can't find vi in PATH\n"
 msgstr " エディタが起動できません(vi にも PATH が通っていません)\n"
 
-msgid " (specify a commit editor in your .hgrc file)\n"
+msgid " (specify a commit editor in your configuration file)\n"
 msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
 
 #, python-format
@@ -7377,7 +7427,7 @@
 msgid "Checking username...\n"
 msgstr "ユーザ名の検証中...\n"
 
-msgid " (specify a username in your .hgrc file)\n"
+msgid " (specify a username in your configuration file)\n"
 msgstr " (設定ファイルでユーザ名を設定してください)\n"
 
 msgid "No problems detected\n"
@@ -8082,6 +8132,15 @@
 "    対象となります。それ以外の場合は、明示的なリビジョン指定が必要です。"
 
 msgid ""
+"    To undo an uncommitted merge, use :hg:`update --clean .` which\n"
+"    will check out a clean copy of the original merge parent, losing\n"
+"    all changes."
+msgstr ""
+"    コミット前にマージ処理を取り消す場合は、:hg:`update --clean .`\n"
+"    が使用できますが、マージ前の親リビジョンの内容で上書きするため、\n"
+"    作業領域中の全ての変更内容が失われます。"
+
+msgid ""
 "    Returns 0 on success, 1 if there are unresolved files.\n"
 "    "
 msgstr ""
@@ -8174,13 +8233,13 @@
 "    シンボル名が指定されない場合、全ての別名定義が表示されます。"
 
 msgid ""
-"    Path names are defined in the [paths] section of\n"
-"    ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n"
+"    Path names are defined in the [paths] section of your\n"
+"    configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n"
 "    repository, ``.hg/hgrc`` is used, too."
 msgstr ""
-"    シンボル定義は、``/etc/mercurial/hgrc`` および ``$HOME/.hgrc`` 等の\n"
+"    シンボル定義は、個人の設定ファイルや ``/etc/mercurial/hgrc`` 等の\n"
 "    [paths] セクションに記述されます。作業領域での実行の場合は\n"
-"    ``.hg/hgrc`` にも記述可能です。"
+"    ``.hg/hgrc`` での記述も参照されます。"
 
 msgid ""
 "    The path names ``default`` and ``default-push`` have a special\n"
@@ -8205,12 +8264,8 @@
 "    :hg:`incoming`) および反映 (例: :hg:`outgoing`、:hg:`email` および\n"
 "    :hg:`bundle`) 操作において適用されます。"
 
-msgid ""
-"    See :hg:`help urls` for more information.\n"
-"    "
-msgstr ""
-"    詳細は :hg:`help urls` を参照してください。\n"
-"    "
+msgid "    See :hg:`help urls` for more information."
+msgstr "    詳細は :hg:`help urls` を参照してください。"
 
 msgid "not found!\n"
 msgstr "指定シンボルは不明です\n"
@@ -8267,6 +8322,11 @@
 "    1 です。\n"
 "    "
 
+msgid ""
+"other repository doesn't support revision lookup, so a rev cannot be "
+"specified."
+msgstr "連携先でリビジョンが特定出来ないため、リビジョンは指定できません"
+
 msgid "push changes to the specified destination"
 msgstr "指定リポジトリへの変更履歴の反映"
 
@@ -8419,19 +8479,19 @@
 msgstr "%s は削除されません: 構成管理対象ではありません\n"
 
 #, python-format
-msgid "not removing %s: file %s (use -f to force removal)\n"
-msgstr ""
-"ファイル %s は削除されません。\n"
-"%s (強行する場合は -f を指定してください)XXXX\n"
-
-msgid "still exists"
-msgstr "まだファイルが存在しています"
+msgid "not removing %s: file still exists (use -f to force removal)\n"
+msgstr "%s は削除されません: ファイルは保持されます(削除の強行は -f を指定)\n"
 
-msgid "is modified"
-msgstr "ファイルが変更されています"
+#, python-format
+msgid "not removing %s: file is modified (use -f to force removal)\n"
+msgstr ""
+"%s は削除されません: ファイルは改変されています(削除の強行は -f を指定)\n"
 
-msgid "has been marked for add"
-msgstr "追加登録対象です"
+#, python-format
+msgid ""
+"not removing %s: file has been marked for add (use -f to force removal)\n"
+msgstr ""
+"%s は削除されません: ファイルは追加登録対象です(削除の強行は -f を指定)\n"
 
 msgid "rename files; equivalent of copy + remove"
 msgstr "ファイルの改名(copy + remove と等価)"
@@ -8452,56 +8512,68 @@
 "    本コマンドの実行結果は次回のコミットの際に効果を発揮します。改名\n"
 "    操作のコミット前取り消しは :hg:`help revert` を参照してください。"
 
-msgid "various operations to help finish a merge"
-msgstr "マージ作業完了を補助する種々の操作"
+msgid "redo merges or set/view the merge status of files"
+msgstr "マージの再実施、ないし各ファイルのマージ状況管理"
+
+msgid ""
+"    Merges with unresolved conflicts are often the result of\n"
+"    non-interactive merging using the ``internal:merge`` configuration\n"
+"    setting, or a command-line merge tool like ``diff3``. The resolve\n"
+"    command is used to manage the files involved in a merge, after\n"
+"    :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n"
+"    working directory must have two parents)."
+msgstr ""
+"    未解消の衝突の多くは ``internal:merge`` や ``diff3`` などを使用した\n"
+"    非対話的なマージに由来します。本コマンドは、:hg:`merge` 実行後から\n"
+"    :hg:`commit` 実行にかけて、マージに関与するファイルを管理します。\n"
+"    (この際には、作業領域は２つの親リビジョンを持つ必要があります)"
+
+msgid "    The resolve command can be used in the following ways:"
+msgstr "    本コマンドは、以下の形式で使用されます:"
+
+msgid ""
+"    - :hg:`resolve FILE...`: attempt to re-merge the specified files,\n"
+"      discarding any previous merge attempts. Re-merging is not\n"
+"      performed for files already marked as resolved. Use ``--all/-a``\n"
+"      to selects all unresolved files."
+msgstr ""
+"    - :hg:`resolve FILE...`: 指定ファイルのマージを再度実施します。\n"
+"      この際には、直前までの変更内容は破棄されます。\n"
+"      衝突解消済みのファイルに対しては、マージの実施はありません。\n"
+"      全ての未解消ファイルに適用する場合は ``--all/-a`` を指定します。"
+
+msgid ""
+"    - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n"
+"      (e.g. after having manually fixed-up the files). The default is\n"
+"      to mark all unresolved files."
+msgstr ""
+"    - :hg:`resolve -m [FILE]`: 指定ファイルを衝突解消済みとみなします\n"
+"      (例: 手動での修正後に実施)。特に指定が無い場合、全ての未解消\n"
+"      ファイルを解消済みとみなします。"
+
+msgid ""
+"    - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The\n"
+"      default is to mark all resolved files."
+msgstr ""
+"    - :hg:`resolve -u [FILE]...`: 指定ファイルを衝突未解消とみなします。\n"
+"      特に指定が無い場合、全ての解消済みファイルを未解消とみなします。"
+
+msgid ""
+"    - :hg:`resolve -l`: list files which had or still have conflicts.\n"
+"      In the printed list, ``U`` = unresolved and ``R`` = resolved."
+msgstr ""
+"    - :hg:`resolve -l`: 衝突が検出されたファイルの解消状況を表示します。\n"
+"      一覧表示において `U`` は未解消(Unresolved)を、\n"
+"      ``R`` は解消済み(Resolved)を意味します。"
 
 msgid ""
-"    This command includes several actions that are often useful while\n"
-"    performing a merge, after running ``merge`` but before running\n"
-"    ``commit``.  (It is only meaningful if your working directory has\n"
-"    two parents.)  It is most relevant for merges with unresolved\n"
-"    conflicts, which are typically a result of non-interactive merging with\n"
-"    ``internal:merge`` or a command-line merge tool like ``diff3``."
-msgstr ""
-"    本コマンドには、``merge`` 実行後から ``commit`` 実行までの、\n"
-"    マージ作業を補助する複数の機能が含まれています\n"
-"    (本コマンドは作業領域が２つの親を持つ場合にのみ意味を持ちます)。\n"
-"    典型的には、``internal:merge`` や、``diff3`` のようなコマンド行\n"
-"    ベースのマージツールによる非対話的なマージの結果によって生じた\n"
-"    未解消の衝突の扱いに関する機能です。"
-
-msgid "    The available actions are:"
-msgstr "    以下の操作が可能です:"
-
-msgid ""
-"      1) list files that were merged with conflicts (U, for unresolved)\n"
-"         and without conflicts (R, for resolved): ``hg resolve -l``\n"
-"         (this is like ``status`` for merges)\n"
-"      2) record that you have resolved conflicts in certain files:\n"
-"         ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n"
-"      3) forget that you have resolved conflicts in certain files:\n"
-"         ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n"
-"      4) discard your current attempt(s) at resolving conflicts and\n"
-"         restart the merge from scratch: ``hg resolve file...``\n"
-"         (or ``-a`` for all unresolved files)"
-msgstr ""
-"      1) 衝突未解消(U: unresolved)および衝突解消済み(R: resolved)なマージ\n"
-"         対象ファイルを一覧表示: ``hg resolve -l``\n"
-"         (マージにおける ``status`` のようなものです)\n"
-"      2) 指定ファイルの衝突を解消したことを記録:\n"
-"         ``hg resolve -m [file ...]`` (無指定時は全ファイルが対象)\n"
-"      3) 指定ファイルの衝突を解消したことを取り消す:\n"
-"         ``hg resolve -u [file ...]`` (無指定時は全ファイルが対象)\n"
-"      4) 全ての衝突解消作業を破棄し、マージを最初からやり直す:\n"
-"         ``hg resolve file...`` (``-a`` 指定時は全ファイルが対象)"
-
-msgid ""
-"    Note that Mercurial will not let you commit files with unresolved merge\n"
-"    conflicts.  You must use ``hg resolve -m ...`` before you can commit\n"
-"    after a conflicting merge."
+"    Note that Mercurial will not let you commit files with unresolved\n"
+"    merge conflicts. You must use :hg:`resolve -m ...` before you can\n"
+"    commit after a conflicting merge."
 msgstr ""
-"    衝突未解消のファイルがある間はコミットできません。マージにおける\n"
-"    衝突解消の際には、コミット前に :hg:`resolve -m ...` してください。"
+"    衝突未解消のファイルがある間はコミットできません。\n"
+"    マージにおける衝突解消の際には、コミット前に \n"
+"    :hg:`resolve -m ...` を実施してください。"
 
 msgid ""
 "    Returns 0 on success, 1 if any files fail a resolve attempt.\n"
@@ -8523,11 +8595,19 @@
 msgstr "ファイル／ディレクトリ状態の復旧"
 
 msgid ""
-"    (Use update -r to check out earlier revisions, revert does not\n"
-"    change the working directory parents.)"
-msgstr ""
-"    ('hg revert' は作業領域の親リビジョンを変更しないので、作業領域の\n"
-"    状態を以前の版に戻す場合は、'hg update' を使用してください)"
+"    NOTE: This command is most likely not what you are looking for. revert\n"
+"    will partially overwrite content in the working directory without "
+"changing\n"
+"    the working directory parents. Use :hg:`update -r rev` to check out "
+"earlier\n"
+"    revisions, or :hg:`update --clean .` to undo a merge which has added\n"
+"    another parent."
+msgstr ""
+"    備考: 本コマンドは、あなたの期待するものと違う可能性が高いです。\n"
+"    本コマンドは、作業領域の親リビジョンはそのままで、作業領域の一部を\n"
+"    上書きします。作業領域の親リビジョンを変更する場合は\n"
+"    :hg:`update -r rev` を、他のリビジョンとのマージを取り消す場合は\n"
+"    :hg:`update --clean .` を使用してください。"
 
 msgid ""
 "    With no revision specified, revert the named files or directories\n"
@@ -8729,6 +8809,9 @@
 "    サーバに空きポート番号の検出および使用をさせる場合、ポート番号には\n"
 "    0 を指定します。この場合、使用するポート番号が表示されます。"
 
+msgid "There is no Mercurial repository here (.hg not found)"
+msgstr "Mercurial リポジトリが見つかりません(.hg が不在です)"
+
 #, python-format
 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
 msgstr "http://%s%s/%s で待ち受け開始(バインド先は %s:%d)\n"
@@ -8962,6 +9045,9 @@
 msgid "tag names must be unique"
 msgstr "タグ名が重複しています"
 
+msgid "tag names cannot consist entirely of whitespace"
+msgstr "空白文字だけで構成されたタグ名は不正です"
+
 msgid "--rev and --remove are incompatible"
 msgstr "--rev と --remove は同時に使用できません"
 
@@ -9039,13 +9125,13 @@
 msgstr "    指定されたリビジョン時点の内容で、作業領域を更新します。"
 
 msgid ""
-"    If no changeset is specified, attempt to update to the head of the\n"
-"    current branch. If this head is a descendant of the working\n"
+"    If no changeset is specified, attempt to update to the tip of the\n"
+"    current branch. If this changeset is a descendant of the working\n"
 "    directory's parent, update to it, otherwise abort."
 msgstr ""
-"    リビジョン指定が無い場合、現行ブランチのヘッドによる更新を試みます。\n"
-"    このヘッドが、作業領域の親リビジョンの直系の子孫であれば、\n"
-"    作業領域の更新が実施されますが、それ以外の場合は更新が中断されます。"
+"    リビジョン指定が無い場合、現行ブランチの最新リビジョンで更新します。\n"
+"    このリビジョンが、作業領域の親リビジョンの直系の子孫であれば、\n"
+"    作業領域の更新が実施されますが、それ以外の場合は更新を中断します。"
 
 msgid ""
 "    The following rules apply when the working directory contains\n"
@@ -9114,7 +9200,7 @@
 "    integrity of their crosslinks and indices."
 msgstr ""
 "    本コマンドは、リポジトリの整合性に関する広範な検証を行います。\n"
-"    変更記録・マニフェスト・各構成管理対象ファイルにおけるハッシュ値\n"
+"    変更履歴・マニフェスト・各構成管理対象ファイルにおけるハッシュ値\n"
 "    およびチェックサム、相互関連付けおよびインデックス等の整合性が\n"
 "    検証されます。"
 
@@ -9556,8 +9642,8 @@
 msgid "show topological heads only"
 msgstr "子を持たない全てのリビジョンを表示"
 
-msgid "show active branchheads only [DEPRECATED]"
-msgstr "アクティブなブランチヘッドのみを表示 [非推奨]"
+msgid "show active branchheads only (DEPRECATED)"
+msgstr "アクティブなブランチヘッドのみを表示 (非推奨)"
 
 msgid "show normal and closed branch heads"
 msgstr "閉鎖したヘッドも表示"
@@ -9753,8 +9839,8 @@
 msgid "mark files as resolved"
 msgstr "当該ファイルを衝突解消済み状態に設定"
 
-msgid "unmark files as resolved"
-msgstr "当該ファイルを衝突未解消状態に設定"
+msgid "mark files as unresolved"
+msgstr "当該ファイルを衝突解消済み状態に設定"
 
 msgid "hide status prefix"
 msgstr "状態記号の表示を抑止"
@@ -9904,6 +9990,10 @@
 msgid "not found in manifest"
 msgstr "マニフェストにありません"
 
+#, python-format
+msgid "no such file in rev %s"
+msgstr "リビジョン %s に当該ファイルは存在しません"
+
 msgid "branch name not in UTF-8!"
 msgstr "ブランチ名が UTF-8 ではありません!"
 
@@ -9948,6 +10038,18 @@
 msgstr "コピー失敗: %s はファイルでもシンボリックリンクでもありません\n"
 
 #, python-format
+msgid "invalid character in dag description: %s..."
+msgstr ""
+
+#, python-format
+msgid "expected id %i, got %i"
+msgstr ""
+
+#, python-format
+msgid "parent id %i is larger than current id %i"
+msgstr ""
+
+#, python-format
 msgid "invalid event type in dag: %s"
 msgstr ""
 
@@ -10160,14 +10262,18 @@
 msgstr "不正な --config 指定: %r (有効な形式は --config section.name=value)"
 
 #, python-format
+msgid "error getting current working directory: %s"
+msgstr "現ディレクトリ位置の取得に失敗: %s"
+
+#, python-format
 msgid "extension '%s' overrides commands: %s\n"
 msgstr "エクステンション '%s' がコマンドを上書きします: %s\n"
 
-msgid "Option --config may not be abbreviated!"
-msgstr "--config 指定値が未解析の可能性があります!"
+msgid "option --config may not be abbreviated!"
+msgstr "--config 指定値が省略されなかった可能性があります!"
 
-msgid "Option --cwd may not be abbreviated!"
-msgstr "--cwd 指定値が未解析の可能性があります!"
+msgid "option --cwd may not be abbreviated!"
+msgstr "--cwd 指定値が省略されなかった可能性があります!"
 
 msgid ""
 "Option -R has to be separated from other options (e.g. not -qR) and --"
@@ -10182,6 +10288,9 @@
 msgid "repository '%s' is not local"
 msgstr "リポジトリ '%s' はローカルリポジトリではありません"
 
+msgid "warning: --repository ignored\n"
+msgstr "警告: --repository 指定を無視します\n"
+
 msgid "invalid arguments"
 msgstr "引数が不正です"
 
@@ -10268,9 +10377,12 @@
 msgid "merging %s failed!\n"
 msgstr "%s のマージに失敗!\n"
 
+msgid "starting revisions are not directly related"
+msgstr "開始リビジョンと直接の関連がありません"
+
 #, python-format
-msgid "Inconsistent state, %s:%s is good and bad"
-msgstr "状態が矛盾 - %s:%s は判定不能"
+msgid "inconsistent state, %s:%s is good and bad"
+msgstr "状態矛盾: %s:%s は良否判定不能"
 
 #, python-format
 msgid "unknown bisect kind %s"
@@ -10560,13 +10672,13 @@
 msgid ""
 "To make Mercurial produce the git extended diff format, use the --git\n"
 "option available for many commands, or set 'git = True' in the [diff]\n"
-"section of your hgrc. You do not need to set this option when\n"
-"importing diffs in this format or using them in the mq extension.\n"
+"section of your configuration file. You do not need to set this option\n"
+"when importing diffs in this format or using them in the mq extension.\n"
 msgstr ""
 "Mercurial から git 拡張差分形式の出力を得るには、受理可能なコマンドに\n"
 "対して --git を指定するか、設定ファイルの [diff] セクションに\n"
-"'git = True' 記述を追加してください。hg import や mq エクステンションを\n"
-"使用する場合は、この指定は不要です。\n"
+"'git = True' 記述を追加してください。:hg:`import` や \n"
+"mq エクステンションを使用する場合は、この指定は不要です。\n"
 
 msgid ""
 "HG\n"
@@ -10591,8 +10703,8 @@
 "    コミットの際のメッセージ入力を行うためのエディタの名前。EDITOR 環境変数\n"
 "    についても参照してください。"
 
-msgid "    (deprecated, use .hgrc)"
-msgstr "    (推奨されない環境変数。設定ファイル経由で指定してください。)"
+msgid "    (deprecated, use configuration file)"
+msgstr "    (非推奨: 設定ファイル経由で指定してください)"
 
 msgid ""
 "HGENCODING\n"
@@ -10638,10 +10750,10 @@
 
 msgid ""
 "HGRCPATH\n"
-"    A list of files or directories to search for hgrc files. Item\n"
-"    separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
-"    platform default search path is used. If empty, only the .hg/hgrc\n"
-"    from the current repository is read."
+"    A list of files or directories to search for configuration\n"
+"    files. Item separator is \":\" on Unix, \";\" on Windows. If HGRCPATH\n"
+"    is not set, platform default search path is used. If empty, only\n"
+"    the .hg/hgrc from the current repository is read."
 msgstr ""
 "HGRCPATH\n"
 "    設定ファイル読込のための、ファイルないしディレクトリの一覧の指定。\n"
@@ -10662,15 +10774,15 @@
 
 msgid ""
 "HGPLAIN\n"
-"    When set, this disables any options in .hgrc that might change\n"
-"    Mercurial's default output. This includes encoding, defaults,\n"
-"    verbose mode, debug mode, quiet mode, tracebacks, and\n"
+"    When set, this disables any configuration settings that might\n"
+"    change Mercurial's default output. This includes encoding,\n"
+"    defaults, verbose mode, debug mode, quiet mode, tracebacks, and\n"
 "    localization. This can be useful when scripting against Mercurial\n"
 "    in the face of existing user configuration."
 msgstr ""
 "HGPLAIN\n"
 "    この環境変数が設定された場合、Mercurial の表示設定を変更し得る\n"
-"    .hgrc 中の記述が全て無視されます。encoding や defaults の指定、\n"
+"    設定ファイル中の記述が全て無視されます。encoding や defaults の指定、\n"
 "    verbose モード、debug モード、quiet モード、tracebacks や各国語設定が\n"
 "    対象となります。ユーザ設定を温存したままで、ツール等から Mercurial を\n"
 "    使用する場合に有用です。"
@@ -10693,7 +10805,7 @@
 
 msgid ""
 "    - HGUSER (deprecated)\n"
-"    - hgrc files from the HGRCPATH\n"
+"    - configuration files from the HGRCPATH\n"
 "    - EMAIL\n"
 "    - interactive prompt\n"
 "    - LOGNAME (with ``@hostname`` appended)"
@@ -10782,13 +10894,13 @@
 "必要に応じて有効化するのは利用者の責務です。"
 
 msgid ""
-"To enable the \"foo\" extension, either shipped with Mercurial or in\n"
-"the Python search path, create an entry for it in your hgrc, like\n"
-"this::"
-msgstr ""
-"\"foo\" というエクステンションを有効化するには、Mercurial 同梱の\n"
-"ものであろうと、Python の検索パス中のものであろうと、設定ファイル\n"
-"において以下のような記述が必要です::"
+"To enable the \"foo\" extension, either shipped with Mercurial or in the\n"
+"Python search path, create an entry for it in your configuration file,\n"
+"like this::"
+msgstr ""
+"\"foo\" というエクステンションを有効化するには、\n"
+"Mercurial 同梱のものであろうと、Python の検索パス中のものであろうと、\n"
+"設定ファイルにおいて以下のような記述が必要です::"
 
 msgid ""
 "  [extensions]\n"
@@ -10808,8 +10920,8 @@
 "  myfeature = ~/.hgext/myfeature.py"
 
 msgid ""
-"To explicitly disable an extension enabled in an hgrc of broader\n"
-"scope, prepend its path with !::"
+"To explicitly disable an extension enabled in a configuration file of\n"
+"broader scope, prepend its path with !::"
 msgstr ""
 "明示的にエクステンションを無効化する場合、適切な設定ファイルにおいて\n"
 "パス指定部分に '!' を記述します::"
@@ -10835,6 +10947,11 @@
 "    changeset is an ancestor, and a parent of an ancestor is an\n"
 "    ancestor. See also: 'Descendant'."
 msgstr ""
+"Ancestor\n"
+"    [祖先] 指定されたリビジョンから、親リビジョンを順に辿る事で到達\n"
+"    可能な任意のリビジョンのこと。より正確には、あるリビジョンにとっては\n"
+"    直接の親リビジョンは祖先であり、祖先(＝直接の親リビジョン含む)の\n"
+"    親リビジョンも祖先となります。'Descendant' も参照のこと。"
 
 msgid ""
 "Branch\n"
@@ -10844,6 +10961,14 @@
 "    a named branch. If a topological branch is not named, it becomes\n"
 "    an anonymous branch. See 'Branch, anonymous' and 'Branch, named'."
 msgstr ""
+"Branch\n"
+"    (名詞) [ブランチ] ヘッドではない(＝ 他に子リビジョンを持つ)\n"
+"    リビジョンを親として、新規に作成された子リビジョンのこと。\n"
+"    これは「位相的 (topological) ブランチ」と呼ばれます。\n"
+"    ('Branch, topological' 参照) 位相的ブランチに名前が付与された場合は\n"
+"    「名前付きブランチ」と呼ばれます。名前を持たない位相的ブランチは、\n"
+"    「名前無しブランチ」と呼ばれます。'Branch, anonymous' および \n"
+"    'Branch, named' も参照のこと。"
 
 msgid ""
 "    Branches may be created when changes are pulled from or pushed to\n"
@@ -10854,17 +10979,26 @@
 "    explicitly with a named branch, but it can also be done locally,\n"
 "    using bookmarks or clones and anonymous branches."
 msgstr ""
+"    ブランチは、別のリポジトリとの間での連携 (反映／取り込み) の際に\n"
+"    連携先で生成されたリビジョンが新規ヘッドとして取り込まれることで、\n"
+"    生成される場合があります。「ブランチ」という呼称は、利用者が独立して\n"
+"    開発を行う過程を指すのに使用される場合があります。このような相互に\n"
+"    独立した開発は、名前付きブランチを明示的に作成して実施されることも\n"
+"    あれば、ブックマーク機能や、複製と名前無しブランチを使用することで\n"
+"    実施される場合もあります。"
 
 msgid "    Example: \"The experimental branch\"."
-msgstr ""
+msgstr "    例: \"実験的な(開発用)ブランチ\""
 
 msgid ""
 "    (Verb) The action of creating a child changeset which results in\n"
 "    its parent having more than one child."
 msgstr ""
+"    (動詞) [ブランチする/分岐する/枝分かれする] あるリビジョンにおいて\n"
+"    子リビジョンが２つ以上になるようなリビジョンを作成する操作のこと。"
 
 msgid "    Example: \"I'm going to branch at X\"."
-msgstr ""
+msgstr "    例: \"リビジョン X からブランチする\""
 
 msgid ""
 "Branch, anonymous\n"
@@ -10872,22 +11006,48 @@
 "    a head and the name of the branch is not changed, a new anonymous\n"
 "    branch is created."
 msgstr ""
+"Branch, anonymous\n"
+"    [名前無しブランチ/匿名ブランチ] ヘッドではない(＝ 他に子リビジョンを\n"
+"    持つ)リビジョンを親として、新規に作成されたリビジョンが、親と同じ\n"
+"    ブランチに属する場合、名前無しブランチが作成されたとみなされます。"
 
 msgid ""
 "Branch, closed\n"
 "    A named branch whose branch heads have all been closed."
 msgstr ""
+"Branch, closed\n"
+"    [閉鎖ブランチ] 全てのヘッドが閉鎖された、名前付きブランチのこと。"
 
 msgid ""
 "Branch, default\n"
 "    The branch assigned to a changeset when no name has previously been\n"
 "    assigned."
 msgstr ""
+"Branch, default\n"
+"    [デフォルトブランチ] 名前付きブランチへの所属が、明示的に指定\n"
+"    されないリビジョンが属するブランチのこと。"
 
 msgid ""
 "Branch head\n"
 "    See 'Head, branch'."
 msgstr ""
+"Branch head\n"
+"    'Head, branch' 参照のこと。"
+
+msgid ""
+"Branch, inactive\n"
+"    If a named branch has no topological heads, it is considered to be\n"
+"    inactive. As an example, a feature branch becomes inactive when it\n"
+"    is merged into the default branch. The :hg:`branches` command\n"
+"    shows inactive branches by default, though they can be hidden with\n"
+"    :hg:`branches --active`."
+msgstr ""
+
+msgid ""
+"    NOTE: this concept is deprecated because it is too implicit.\n"
+"    Branches should now be explicitly closed using :hg:`commit\n"
+"    --close-branch` when they are no longer needed."
+msgstr ""
 
 msgid ""
 "Branch, named\n"
@@ -10898,6 +11058,13 @@
 "    :hg:`commit --close-branch` for more information on managing\n"
 "    branches."
 msgstr ""
+"Branch, named\n"
+"    [名前付きブランチ] 同一のブランチ名を持つリビジョンの集合のこと。\n"
+"    名前付きブランチに属するリビジョンの子リビジョンは、同じ名前付き\n"
+"    ブランチに属します。明示的に指定することで、子リビジョンを別な\n"
+"    名前付きブランチに所属させることも可能です。ブランチ管理の詳細は、\n"
+"    :hg:`help branch`、:hg:`help branches` および \n"
+"    :hg:`commit --close-branch` を参照のこと。"
 
 msgid ""
 "    Named branches can be thought of as a kind of namespace, dividing\n"
@@ -10908,11 +11075,20 @@
 "    further changesets are added to that previous branch, then that\n"
 "    previous branch will be a branch in name only."
 msgstr ""
+"    名前付きブランチは、リポジトリの履歴を構成するリビジョン群を、\n"
+"    重複の無い部分集合へと分割する、名前空間の一種とも言えます。\n"
+"    名前付きブランチは、必ずしも位相的ブランチである必要はありません。\n"
+"    任意の名前付きブランチ(default でも可)のヘッドとなるリビジョンを\n"
+"    親として、新たな名前付きブランチを生成した場合、元となるブランチに\n"
+"    新たなリビジョンが追加されなければ、元のブランチは (位相的な\n"
+"    ブランチではなく) 名前付けのためだけのブランチと言えます。"
 
 msgid ""
 "Branch tip\n"
 "    See 'Tip, branch'."
 msgstr ""
+"Branch tip\n"
+"    'Tip, branch' 参照のこと。"
 
 msgid ""
 "Branch, topological\n"
@@ -10922,6 +11098,12 @@
 "    branch is not named, it becomes an anonymous branch of the\n"
 "    current, possibly default, branch."
 msgstr ""
+"Branch, topological\n"
+"    [位相的ブランチ] ヘッドではない(＝ 他に子リビジョンを持つ)\n"
+"    リビジョンを親として、新規に作成されたリビジョンは、位相的ブランチ\n"
+"    となります。位相的ブランチに名前が与えられた場合、それは名前付き\n"
+"    ブランチとなります。位相的ブランチに名前が与えられない場合、現行\n"
+"    ブランチ (通常は default) における無名ブランチとなります。"
 
 msgid ""
 "Changelog\n"
@@ -10929,11 +11111,23 @@
 "    to the repository. This includes details such as changeset id,\n"
 "    author, commit message, date, and list of changed files."
 msgstr ""
+"Changelog\n"
+"    [変更履歴/チェンジログ] 各リビジョンの内容を、リポジトリに登録された\n"
+"    順に記録したもの。記録内容には、識別用ハッシュ値、 作成者名、\n"
+"    コミットログ、日付および変更対象ファイルの一覧が含まれます。"
 
 msgid ""
 "Changeset\n"
 "    A snapshot of the state of the repository used to record a change."
 msgstr ""
+"Changeset\n"
+"    [チェンジセット] 変更内容の記録に使用する、リポジトリ状態の\n"
+"    スナップショット。 ※ 訳注: 歴史的な経緯から、チェンジセットと\n"
+"    リビジョンは通常、同じ意味で使用されるケースが多いです。日本語訳の\n"
+"    際には、複数ファイルに渡る差分一式のことを指す場合はチェンジセット、\n"
+"    リポジトリに登録されることで履歴中の位置が確定済みのチェンジセット\n"
+"    のことはリビジョン、と呼称することが多いですが、必ずしも統一\n"
+"    されている訳ではありません。'Revision' も参照のこと。"
 
 msgid ""
 "Changeset, child\n"
@@ -10941,6 +11135,13 @@
 "    a child of P. There is no limit to the number of children that a\n"
 "    changeset may have."
 msgstr ""
+"Changeset, child\n"
+"    [子チェンジセット/子リビジョン] 「親リビジョン」の対義語。\n"
+"    リビジョン P がリビジョン C の親リビジョンである場合、C は P の\n"
+"    子リビジョンとなります。1つの親リビジョンに対して、子リビジョンの\n"
+"    数には上限がありません。 訳注: 親／子関係を持つ、ということは、\n"
+"    履歴中の位置が確定していることを意味するため、ここでは敢えて\n"
+"    changeset を「リビジョン」と訳しています。'Changeset' も参照のこと。"
 
 msgid ""
 "Changeset id\n"
@@ -10948,12 +11149,22 @@
 "    represented as either a \"long\" 40-byte hexadecimal string, or a\n"
 "    \"short\" 12-byte hexadecimal string."
 msgstr ""
+"Changeset id\n"
+"    [チェンジセットID/識別用ハッシュ値] チェンジセットを一意に識別\n"
+"    するための SHA-1 ハッシュ値。40 桁 16 進数として表現される\n"
+"   「完全長」と、12 桁 16 進数として表現される「短縮」の形式があります。"
 
 msgid ""
 "Changeset, merge\n"
 "    A changeset with two parents. This occurs when a merge is\n"
 "    committed."
 msgstr ""
+"Changeset, merge\n"
+"    [マージチェンジセット/マージリビジョン] 親リビジョンを２つ持つ\n"
+"    リビジョン。マージ操作がコミットされる際にこのようなリビジョンが\n"
+"    生成されます。※ 訳注: 親／子関係を持つ、ということは、履歴中の\n"
+"    位置が確定していることを意味するため、ここでは敢えて changeset を\n"
+"   「リビジョン」と訳しています。'Changeset' も参照のこと。"
 
 msgid ""
 "Changeset, parent\n"
@@ -10962,6 +11173,14 @@
 "    immediately precedes C in the DAG. Changesets have at most two\n"
 "    parents."
 msgstr ""
+"Changeset, parent\n"
+"    [親チェンジセット/親リビジョン] 子リビジョンの由来元のリビジョン。\n"
+"    より明確には、リビジョン C の親リビジョンは、(旧→新順の) 履歴\n"
+"    ツリーにおいて、リビジョン C の直前に位置するリビジョンを指します。\n"
+"    各リビジョンは、最大で 2 つの親リビジョンを持ちます。\n"
+"    ※ 訳注: 親／子関係を持つ、ということは、履歴中の位置が確定している\n"
+"    ことを意味するため、ここでは敢えて changeset を「リビジョン」と\n"
+"    訳しています。'Changeset' も参照のこと。"
 
 msgid ""
 "Checkout\n"
@@ -10969,60 +11188,85 @@
 "    revision. This use should probably be avoided where possible, as\n"
 "    changeset is much more appropriate than checkout in this context."
 msgstr ""
+"Checkout\n"
+"    (名詞) [チェックアウト] 指定したリビジョン時点の内容で更新された\n"
+"    作業領域のこと。同等の意味を表す場合、「リビジョン」の方が妥当で\n"
+"    あるため、この用法での使用は避けるべきです。"
 
 msgid "    Example: \"I'm using checkout X.\""
-msgstr ""
+msgstr "    例: \"チェックアウトした X を使用する。\""
 
 msgid ""
 "    (Verb) Updating the working directory to a specific changeset. See\n"
 "    :hg:`help update`."
 msgstr ""
+"    (動詞) [チェックアウトする] 指定したリビジョンの内容で、作業領域を\n"
+"    更新すること。 :hg:`help update` も参照のこと。"
 
 msgid "    Example: \"I'm going to check out changeset X.\""
-msgstr ""
+msgstr "    例: \"リビジョン X をチェックアウトする。\""
 
 msgid ""
 "Child changeset\n"
 "    See 'Changeset, child'."
 msgstr ""
+"Child changeset\n"
+"    'Changeset, child' を参照のこと。"
 
 msgid ""
 "Close changeset\n"
 "    See 'Changeset, close'."
 msgstr ""
+"Close changeset\n"
+"    'Changeset, close' を参照のこと ※ 訳注: 'Branch, closed' の間違いか？"
 
 msgid ""
 "Closed branch\n"
 "    See 'Branch, closed'."
 msgstr ""
+"Closed branch\n"
+"    'Branch, closed' を参照のこと。"
 
 msgid ""
 "Clone\n"
 "    (Noun) An entire or partial copy of a repository. The partial\n"
 "    clone must be in the form of a revision and its ancestors."
 msgstr ""
+"Clone\n"
+"    (名詞) [複製(リポジトリ)] あるリポジトリから、全体ないし一部を複製\n"
+"   したリポジトリのこと。部分複製リポジトリの持つ変更履歴は、\n"
+"   指定リビジョンとその祖先から構成されます。"
 
 msgid "    Example: \"Is your clone up to date?\"."
-msgstr ""
+msgstr "    例: \"あなたの複製(リポジトリ)は最新ですか？\""
 
 msgid "    (Verb) The process of creating a clone, using :hg:`clone`."
 msgstr ""
+"    (動詞) [(リポジトリの)複製] 複製リポジトリを作成する操作のこと。\n"
+"    :hg:`clone` を使用します。"
 
 msgid "    Example: \"I'm going to clone the repository\"."
-msgstr ""
+msgstr "    例: \"リポジトリを複製します。\""
 
 msgid ""
 "Closed branch head\n"
 "    See 'Head, closed branch'."
 msgstr ""
+"Closed branch head\n"
+"    'Head, closed branch' を参照のこと。"
 
 msgid ""
 "Commit\n"
 "    (Noun) A synonym for changeset."
 msgstr ""
+"Commit\n"
+"    (名詞) [コミット] リビジョンの別称。 ※ 訳注: コミット済み\n"
+"    ということは、履歴中の位置が確定していることを意味するため、\n"
+"    ここでは敢えて changeset を「リビジョン」と訳しています。\n"
+"    'Changeset' も参照のこと。"
 
 msgid "    Example: \"Is the bug fixed in your recent commit?\""
-msgstr ""
+msgstr "    例: \"最新のコミットで、バグは修正されていますか？\""
 
 msgid ""
 "    (Verb) The act of recording changes to a repository. When files\n"
@@ -11030,14 +11274,20 @@
 "    differences between the committed files and their parent\n"
 "    changeset, creating a new changeset in the repository."
 msgstr ""
+"    (動詞) [コミットする] 変更内容をリポジトリに記録する操作のこと。\n"
+"    コミットの際には、コミット対象ファイルの作業領域中の内容と、\n"
+"    親リビジョン時点における内容との差分が確認され、新規のリビジョンが\n"
+"    リポジトリに作成されます。"
 
 msgid "    Example: \"You should commit those changes now.\""
-msgstr ""
+msgstr "    例: \"その変更は、すぐにコミットすべきです。\""
 
 msgid ""
 "Cset\n"
 "    A common abbreviation of the term changeset."
 msgstr ""
+"Cset\n"
+"    「チェンジセット」の略記。"
 
 msgid ""
 "DAG\n"
@@ -11093,7 +11343,7 @@
 "    Mercurial, that will be recorded in the next commit. The working\n"
 "    directory initially corresponds to the snapshot at an existing\n"
 "    changeset, known as the parent of the working directory. See\n"
-"    'Parents, working directory'. The state may be modified by changes\n"
+"    'Parent, working directory'. The state may be modified by changes\n"
 "    to the files introduced manually or by a merge. The repository\n"
 "    metadata exists in the .hg directory inside the working directory."
 msgstr ""
@@ -11629,7 +11879,7 @@
 "  A DAG range, meaning all changesets that are descendants of x and\n"
 "  ancestors of y, including x and y themselves. If the first endpoint\n"
 "  is left out, this is equivalent to ``ancestors(y)``, if the second\n"
-"  is left out it is equivalent to ``descendents(x)``."
+"  is left out it is equivalent to ``descendants(x)``."
 msgstr ""
 
 msgid "  An alternative syntax is ``x..y``."
@@ -12138,6 +12388,11 @@
 msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
 msgstr ":shortdate: 日時情報。\"2006-09-18\" 形式で可読化します。"
 
+msgid ""
+":stringify: Any type. Turns the value into text by converting values into\n"
+"    text and concatenating them."
+msgstr ":stringify: 任意のデータ。値を文字列化して連結します"
+
 msgid ":strip: Any text. Strips all leading and trailing whitespace."
 msgstr ":strip: 文字列。先頭／末尾の空白文字を取り除きます。"
 
@@ -12237,18 +12492,18 @@
 "      Compression yes"
 
 msgid ""
-"  Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
-"  with the --ssh command line option."
+"  Alternatively specify \"ssh -C\" as your ssh command in your\n"
+"  configuration file or with the --ssh command line option."
 msgstr ""
 "  あるいは、設定ファイルにおける ssh コマンド指定や、コマンドラインでの\n"
-"  --ssh に対して、'ssh -C' を指定する方法もあります。"
+"  --ssh オプションに対して、'ssh -C' を指定する方法もあります。"
 
 msgid ""
-"These URLs can all be stored in your hgrc with path aliases under the\n"
-"[paths] section like so::"
+"These URLs can all be stored in your configuration file with path\n"
+"aliases under the [paths] section like so::"
 msgstr ""
-"連携先 URL は、設定ファイルの [paths] セクションで、別名を付けて記述\n"
-"することが出来ます::"
+"連携先 URL は、設定ファイルの [paths] セクションで、\n"
+"別名を付けて記述することが出来ます::"
 
 msgid ""
 "  [paths]\n"
@@ -12361,6 +12616,10 @@
 msgid "error reading %s/.hg/hgrc: %s\n"
 msgstr "%s/.hg/hgrc の読み込みに失敗: %s\n"
 
+#, python-format
+msgid "error accessing repository at %s\n"
+msgstr "リポジトリ %s へのアクセス失敗\n"
+
 msgid "SSL support is unavailable"
 msgstr "SSL サポートが利用できません"
 
@@ -12575,6 +12834,9 @@
 msgid "cannot partially commit a merge (do not specify files or patterns)"
 msgstr "マージの部分コミットはできません(ファイル名／パターンは指定できません)"
 
+msgid "can't commit subrepos without .hgsub"
+msgstr ".hgsub の無い副リポジトリはコミットできません"
+
 msgid "file not found!"
 msgstr "ファイルが見つかりません!"
 
@@ -12603,7 +12865,7 @@
 msgstr "全チェンジセットを取得中\n"
 
 msgid ""
-"Partial pull cannot be done because other repository doesn't support "
+"partial pull cannot be done because other repository doesn't support "
 "changegroupsubset."
 msgstr "連携先の changegroupsubset 機能未対応により、部分取り込みできません。"
 
@@ -12683,8 +12945,8 @@
 msgid "transferred %s in %.1f seconds (%s/sec)\n"
 msgstr "%s を %.1f 秒で送信しました（%s/秒）\n"
 
-msgid "no [smtp]host in hgrc - cannot send mail"
-msgstr "設定ファイルに [smtp] host 指定がありません - メール送信に失敗"
+msgid "smtp.host not configured - cannot send mail"
+msgstr "設定ファイルに smtp.host 指定がありません - メール送信に失敗"
 
 #, python-format
 msgid "sending mail: smtp host %s, port %s\n"
@@ -12728,6 +12990,13 @@
 msgstr "マニフェストから %s を削除できませんでした"
 
 #, python-format
+msgid "invalid pattern (%s): %s"
+msgstr "不正パターン (%s): %s"
+
+msgid "invalid pattern"
+msgstr "不正パターン"
+
+#, python-format
 msgid "diff context lines count must be an integer, not %r"
 msgstr "差分コンテキストでの行数指定が不正です: %r"
 
@@ -12786,6 +13055,9 @@
 msgid "&Deleted"
 msgstr "&Deleted"
 
+msgid "updating"
+msgstr "更新中"
+
 #, python-format
 msgid "update failed to remove %s: %s!\n"
 msgstr "%s の削除に失敗: %s!\n"
@@ -12900,7 +13172,7 @@
 msgstr "patch コマンドが失敗: %s"
 
 #, python-format
-msgid "Unsupported line endings type: %s"
+msgid "unsupported line endings type: %s"
 msgstr "未サポートの行末種別: %s"
 
 msgid ""
@@ -12914,7 +13186,7 @@
 
 #, python-format
 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
-msgstr "%d ファイル変更、追加 %d 行(+)、削除 %d 行(-)\n"
+msgstr " %d ファイル変更、追加 %d 行(+)、削除 %d 行(-)\n"
 
 #, python-format
 msgid "exited with status %d"
@@ -12932,6 +13204,14 @@
 msgstr "ブランチを追加中\n"
 
 #, python-format
+msgid "strip failed, full bundle stored in '%s'\n"
+msgstr "リビジョン除外に失敗: 完全なバンドルを '%s' に保存\n"
+
+#, python-format
+msgid "strip failed, partial bundle stored in '%s'\n"
+msgstr "リビジョンの除外に失敗: 部分的なバンドルを '%s' に保存\n"
+
+#, python-format
 msgid "cannot %s; remote repository does not support the %r capability"
 msgstr "%s できません。機能 %s はリモートリポジトリでは未サポートです"
 
@@ -12990,9 +13270,6 @@
 msgid "missing argument"
 msgstr "引数がありません"
 
-msgid "can't negate that"
-msgstr "負値にできません"
-
 #, python-format
 msgid "can't use %s here"
 msgstr "ここでは %s を使用できません"
@@ -13031,6 +13308,10 @@
 msgid "grep wants a string"
 msgstr "grep の引数は文字列でなければなりません"
 
+#, python-format
+msgid "invalid match pattern: %s"
+msgstr "不正なマッチングパターン: %s"
+
 msgid "author wants a string"
 msgstr "author の引数は文字列でなければなりません"
 
@@ -13077,6 +13358,9 @@
 msgid "tagged takes no arguments"
 msgstr "tagged には引数が指定できません"
 
+msgid "can't negate that"
+msgstr "負値にできません"
+
 msgid "not a symbol"
 msgstr "シンボル以外が指定されました"
 
@@ -13263,6 +13547,10 @@
 msgid "username %s contains a newline\n"
 msgstr "ユーザ名 %s は改行を含んでいます\n"
 
+#, python-format
+msgid "(deprecated '%%' in path %s=%s from %s)\n"
+msgstr "(パス定義 %s=%s(%s 由来) において、非推奨な '%%' が使用)\n"
+
 msgid "response expected"
 msgstr "レスポンスがありません"
 
diff -Nru mercurial-1.6.2/i18n/pt_BR.po mercurial-1.6.4/i18n/pt_BR.po
--- mercurial-1.6.2/i18n/pt_BR.po	2010-08-02 18:29:59.000000000 +0000
+++ mercurial-1.6.4/i18n/pt_BR.po	2010-10-01 15:18:50.000000000 +0000
@@ -95,7 +95,7 @@
 "comandos além de push e pull. Ele não é seguro se os usuários tiverem\n"
 "acesso a um shell interativo, pois eles então poderão desabilitar o\n"
 "gancho. Também não é seguro se usuários remotos compartilharem uma\n"
-"conta local, pois não haverá maneira de distingüí-los."
+"conta local, pois não haverá maneira de distingui-los."
 
 msgid "The order in which access checks are performed is:"
 msgstr "A ordem na qual verificações de acesso são realizadas é:"
@@ -231,8 +231,8 @@
 msgstr ""
 "  [acl]\n"
 "  # Permite ou recusa acesso para revisões de entrada apenas se sua origem\n"
-"  # estiver listada aqui, caso contrário ignora esta verificação. A origem é\n"
-"  # \"serve\" para todo tipo de acesso remoto (http ou ssh), \"push\",\n"
+"  # estiver listada aqui, caso contrário ignora esta verificação. A origem\n"
+"  # é \"serve\" para todo tipo de acesso remoto (http ou ssh), \"push\",\n"
 "  # \"pull\" ou \"bundle\" quando os comandos correspondentes forem\n"
 "  # executados do lado local.\n"
 "  # Padrão: serve\n"
@@ -324,7 +324,7 @@
 "  # everyone being able to change all other files. See below.\n"
 "  src/main/resources/DONT-TOUCH-THIS.txt = *"
 msgstr ""
-"  # Ninguém será capaz de mudar \"NAO-MEXA-NISSO.txt\", apesar de\n"
+"  # Ninguém será capaz de mudar \"NÃO-MEXA-NISSO.txt\", apesar de\n"
 "  # todos poderem mudar todos os outros arquivos. Veja abaixo.\n"
 "  src/main/resources/NAO-MEXA-NISSO.txt = *"
 
@@ -343,8 +343,8 @@
 "  # folder:\n"
 "  docs/** = doc_writer"
 msgstr ""
-"  # O usuário \"escritor_de_docs\" tem acesso de escrita para qualquer arquivo\n"
-"  # sob a pasta \"docs\":\n"
+"  # O usuário \"escritor_de_docs\" tem acesso de escrita para qualquer\n"
+"  # arquivo sob a pasta \"docs\":\n"
 "  docs/** = escritor_de_docs"
 
 msgid ""
@@ -415,12 +415,12 @@
 "By default, when several bookmarks point to the same changeset, they\n"
 "will all move forward together. It is possible to obtain a more\n"
 "git-like experience by adding the following configuration option to\n"
-"your .hgrc::"
+"your configuration file::"
 msgstr ""
 "Por padrão, quando vários marcadores apontam para a mesma revisão,\n"
 "todos serão movidos para a frente juntos. É possível obter um\n"
 "funcionamento mais semelhante ao do sistema git com a adição das\n"
-"seguintes opções de configuração ao seu .hgrc::"
+"seguintes opções de configuração ao seu arquivo de configuração::"
 
 msgid ""
 "  [bookmarks]\n"
@@ -515,6 +515,10 @@
 msgid "deleting remote bookmark %s\n"
 msgstr "apagando marcador remoto %s\n"
 
+#, python-format
+msgid "bookmark %s does not exist on the local or remote repository!\n"
+msgstr "o marcador %s não existe nem no repositório local nem no remoto!\n"
+
 msgid "searching for changes\n"
 msgstr "procurando por mudanças\n"
 
@@ -585,7 +589,7 @@
 "O gancho se baseia em um script do Bugzilla para enviar emails de\n"
 "notificação de alterações de bugs. Esse script muda entre versões do\n"
 "Bugzilla; o script 'processmail' usado antes da 2.18 é substituído na\n"
-"2.18 e subseqüentes por 'config/sendbugmail.pl'. Note que esse script\n"
+"2.18 e subsequentes por 'config/sendbugmail.pl'. Note que esse script\n"
 "será executado pelo Mercurial assim que o usuário enviar a revisão;\n"
 "você terá que assegurar que as permissões de arquivo da instalação\n"
 "do Bugzilla estejam configuradas apropriadamente."
@@ -755,7 +759,7 @@
 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
 "\"committer\"=\"Bugzilla user\""
 msgstr ""
-"A seção [usermap]é usada para especificar mapeamentos de IDs dos\n"
+"A seção [usermap] é usada para especificar mapeamentos de IDs dos\n"
 "consolidadores do Mercurial para IDs de usuário do Bugzilla. Veja\n"
 "também [bugzilla].usermap.\"committer\"=\"Bugzilla user\""
 
@@ -1042,14 +1046,18 @@
 "    de trabalho, se existir.\n"
 "    "
 
+#, python-format
+msgid "skipping malformed alias: %s\n"
+msgstr "omitindo apelido mal formado: %s\n"
+
 msgid "count rate for the specified revision or range"
-msgstr "conta a freqüência para uma revisão ou faixa especificada"
+msgstr "conta a frequência para uma revisão ou faixa especificada"
 
 msgid "DATE"
 msgstr "DATA"
 
 msgid "count rate for revisions matching date spec"
-msgstr "conta a freqüência das revisões que casem com a data especificada"
+msgstr "conta a frequência das revisões que casem com a data especificada"
 
 msgid "TEMPLATE"
 msgstr "MODELO"
@@ -1064,7 +1072,7 @@
 msgstr "formato compatível com o strftime para agrupar por data"
 
 msgid "count rate by number of changesets"
-msgstr "conta a freqüência pelo numero de revisões"
+msgstr "conta a frequência pelo numero de revisões"
 
 msgid "sort by key (default: sort by count)"
 msgstr "ordenar pela chave (padrão: ordenar pela contagem)"
@@ -1110,8 +1118,8 @@
 "Esse modulo também provê a função render_text, que pode ser utilizada\n"
 "para adicionar efeitos a qualquer texto."
 
-msgid "Default effects may be overridden from the .hgrc file::"
-msgstr "Os efeitos padrão podem ser redefinidos pelo arquivo .hgrc::"
+msgid "Default effects may be overridden from your configuration file::"
+msgstr "Os efeitos padrão podem ser redefinidos pelo seu arquivo de configuração::"
 
 msgid ""
 "  [color]\n"
@@ -1262,11 +1270,11 @@
 
 msgid ""
 "    If no destination directory name is specified, it defaults to the\n"
-"    basename of the source with '-hg' appended. If the destination\n"
+"    basename of the source with ``-hg`` appended. If the destination\n"
 "    repository doesn't exist, it will be created."
 msgstr ""
 "    Se não for especificado o nome do diretório de destino, o padrão\n"
-"    será o nome base da origem com '-hg' anexado. Se o repositório\n"
+"    será o nome base da origem com ``-hg`` anexado. Se o repositório\n"
 "    de destino não existir, ele será criado."
 
 msgid ""
@@ -1323,26 +1331,30 @@
 
 msgid ""
 "    If the file doesn't exist, it's automatically created. It's\n"
-"    updated on each commit copied, so convert-repo can be interrupted\n"
+"    updated on each commit copied, so :hg:`convert` can be interrupted\n"
 "    and can be run repeatedly to copy new commits."
 msgstr ""
 "    Se o arquivo não existir, será automaticamente criado. Ele é\n"
-"    atualizado a cada commit copiado, assim a conversão pode ser\n"
-"    interrompida e executada repetidamente para copiar novos commits."
+"    atualizado a cada commit copiado, assim :hg:`convert` pode ser\n"
+"    interrompido e executado repetidamente para copiar novos commits."
 
 msgid ""
-"    The [username mapping] file is a simple text file that maps each\n"
+"    The username mapping file is a simple text file that maps each\n"
 "    source commit author to a destination commit author. It is handy\n"
 "    for source SCMs that use unix logins to identify authors (eg:\n"
-"    CVS). One line per author mapping and the line format is:\n"
-"    srcauthor=whatever string you want"
+"    CVS). One line per author mapping and the line format is::"
 msgstr ""
-"    O arquivo [mapa de nome de usuário] é um arquivo texto simples\n"
+"    O arquivo de mapeamento de nome de usuário é um arquivo texto simples\n"
 "    que mapeia cada autor de commit da origem para um autor de commit\n"
-"    no destino. Isso é uma ajuda para sistemas de origem que utilizam\n"
-"    logins unix para identificar os autores (ex: CVS). Uma linha por\n"
-"    mapeamento de autor no formato:\n"
-"    autor_origem=qualquer string que você quiser"
+"    no destino. Isso auxilia na conversão de sistemas que utilizam\n"
+"    logins unix para identificar os autores (ex: CVS). É usada uma linha\n"
+"    por mapeamento, com a forma::"
+
+msgid "      source author = destination author"
+msgstr "      autor na origem = autor no destino"
+
+msgid "    Empty lines and lines starting with a ``#`` are ignored."
+msgstr "    Linhas vazias ou começadas por ``#`` são ignoradas."
 
 msgid ""
 "    The filemap is a file that allows filtering and remapping of files\n"
@@ -1362,33 +1374,33 @@
 msgstr "      rename caminho/para/a/origem caminho/para/o/destino"
 
 msgid ""
-"    Comment lines start with '#'. A specificed path matches if it\n"
+"    Comment lines start with ``#``. A specificed path matches if it\n"
 "    equals the full relative name of a file or one of its parent\n"
-"    directories. The 'include' or 'exclude' directive with the longest\n"
-"    matching path applies, so line order does not matter."
+"    directories. The ``include`` or ``exclude`` directive with the\n"
+"    longest matching path applies, so line order does not matter."
 msgstr ""
-"    Linhas de comentário iniciam com '#'. Um caminho especificado\n"
+"    Linhas de comentário iniciam com ``#``. Um caminho especificado\n"
 "    será considerado se for igual ao caminho relativo completo de um\n"
 "    arquivo ou de um de seus diretórios pais. A ordem das linhas não é\n"
-"    importante: será usada a diretiva 'include' ou 'exclude' com o\n"
+"    importante: será usada a diretiva ``include`` ou ``exclude`` com o\n"
 "    caminho mais longo que combine."
 
 msgid ""
-"    The 'include' directive causes a file, or all files under a\n"
+"    The ``include`` directive causes a file, or all files under a\n"
 "    directory, to be included in the destination repository, and the\n"
 "    exclusion of all other files and directories not explicitly\n"
-"    included. The 'exclude' directive causes files or directories to\n"
-"    be omitted. The 'rename' directive renames a file or directory if\n"
+"    included. The ``exclude`` directive causes files or directories to\n"
+"    be omitted. The ``rename`` directive renames a file or directory if\n"
 "    is converted. To rename from a subdirectory into the root of the\n"
-"    repository, use '.' as the path to rename to."
+"    repository, use ``.`` as the path to rename to."
 msgstr ""
-"    A diretiva 'include' faz com que um arquivo, ou todos os arquivos\n"
+"    A diretiva ``include`` faz com que um arquivo, ou todos os arquivos\n"
 "    em um diretório, sejam incluídos no repositório de destino, e\n"
 "    exclui todos os outros arquivos e diretórios não incluídos\n"
-"    explicitamente. A diretiva 'exclude' faz com que os arquivos e\n"
-"    diretórios sejam omitidos. A diretiva 'rename' renomeia um\n"
+"    explicitamente. A diretiva ``exclude`` faz com que os arquivos e\n"
+"    diretórios sejam omitidos. A diretiva ``rename`` renomeia um\n"
 "    arquivo ou diretório que for convertido. Para renomear de um\n"
-"    subdiretório para o raiz do repositório, use '.' como caminho\n"
+"    subdiretório para o raiz do repositório, use ``.`` como caminho\n"
 "    de destino."
 
 msgid ""
@@ -1397,7 +1409,20 @@
 "    useful if you want to e.g. give a Subversion merge two parents, or\n"
 "    graft two disconnected series of history together. Each entry\n"
 "    contains a key, followed by a space, followed by one or two\n"
-"    comma-separated values. The key is the revision ID in the source\n"
+"    comma-separated values::"
+msgstr ""
+"    O splicemap é um arquivo que permite a inserção de histórico\n"
+"    sintético, permitindo que você especifique os pais de uma\n"
+"    revisão. Isto é útil se você por exemplo quiser que um merge do\n"
+"    Subversion tenha dois pais, ou para juntar duas linhas desconexas\n"
+"    de histórico. Cada entrada contém uma chave, seguida de um\n"
+"    espaço, seguido de um ou mais valores separados por vírgulas::"
+
+msgid "      key parent1, parent2"
+msgstr "      chave primeiropai, segundopai"
+
+msgid ""
+"    The key is the revision ID in the source\n"
 "    revision control system whose parents should be modified (same\n"
 "    format as a key in .hg/shamap). The values are the revision IDs\n"
 "    (in either the source or destination revision control system) that\n"
@@ -1406,13 +1431,7 @@
 "    specify the revision on \"trunk\" as the first parent and the one on\n"
 "    the \"release-1.0\" branch as the second."
 msgstr ""
-"    O splicemap é um arquivo que permite a inserção de histórico\n"
-"    sintético, permitindo que você especifique os pais de uma\n"
-"    revisão. Isto é útil se você por exemplo quiser que um merge do\n"
-"    Subversion tenha dois pais, ou para juntar duas linhas desconexas\n"
-"    de histórico. Cada entrada contém uma chave, seguida de um\n"
-"    espaço, seguido de um ou mais valores separados por vírgulas. A\n"
-"    chave é o identificador de revisão no sistema de controle de\n"
+"    A chave é o identificador de revisão no sistema de controle de\n"
 "    versão de origem cujos pais devam ser modificados (mesmo formato\n"
 "    de uma chave em .hg/shamap). Os valores são os identificadores de\n"
 "    revisão (no sistema de origem ou no de destino) que devem ser\n"
@@ -1427,23 +1446,30 @@
 "    conjunction with a splicemap, it allows for a powerful combination\n"
 "    to help fix even the most badly mismanaged repositories and turn them\n"
 "    into nicely structured Mercurial repositories. The branchmap contains\n"
-"    lines of the form \"original_branch_name new_branch_name\".\n"
-"    \"original_branch_name\" is the name of the branch in the source\n"
-"    repository, and \"new_branch_name\" is the name of the branch is the\n"
-"    destination repository. This can be used to (for instance) move code\n"
-"    in one repository from \"default\" to a named branch."
+"    lines of the form::"
 msgstr ""
 "    O branchmap é um arquivo que permite a renomeação de um ramo\n"
 "    quando este for trazido de um repositório externo qualquer. Se\n"
 "    usado em conjunto com um splicemap, fornece uma poderosa\n"
 "    combinação que auxilia o conserto de repositórios mal\n"
 "    gerenciados, transformando-os em repositórios Mercurial\n"
-"    estruturados apropriadamente. O branchmap contém linhas da forma\n"
-"    \"nome_ramo_original nome_novo_ramo\". \"nome_ramo_original\" é\n"
-"    o nome do ramo no repositório de origem, e \"nome_novo_ramo\" é\n"
-"    o nome do ramo no repositório de destino. Isto pode ser usado\n"
-"    para por exemplo mover código em um repositório de \"default\"\n"
-"    para um ramo nomeado."
+"    estruturados apropriadamente. O branchmap contém linhas da forma::"
+
+msgid "      original_branch_name new_branch_name"
+msgstr "      nome_ramo_original nome_novo_ramo"
+
+msgid ""
+"    where \"original_branch_name\" is the name of the branch in the\n"
+"    source repository, and \"new_branch_name\" is the name of the branch\n"
+"    is the destination repository. No whitespace is allowed in the\n"
+"    branch names. This can be used to (for instance) move code in one\n"
+"    repository from \"default\" to a named branch."
+msgstr ""
+"    onde \"nome_ramo_original\" é o nome do ramo no repositório de\n"
+"    origem, e \"nome_novo_ramo\" é o nome do ramo no repositório de\n"
+"    destino. Espaços em branco não são suportados nos nomes de ramo.\n"
+"    Isto pode ser usado para por exemplo mover código em um\n"
+"    repositório de \"default\" para um ramo nomeado."
 
 msgid ""
 "    Mercurial Source\n"
@@ -2023,6 +2049,13 @@
 msgid "Python ElementTree module is not available"
 msgstr "módulo ElementTree do Python não está disponível"
 
+#, python-format
+msgid "%s repository format is unsupported, please upgrade"
+msgstr "o formato de repositório %s não é suportado, por favor atualize"
+
+msgid "failed to detect repository format!"
+msgstr "falha na detecção do formato do repositório!"
+
 msgid "internal calling inconsistency"
 msgstr "inconsistência interna de chamadas"
 
@@ -2214,8 +2247,8 @@
 msgid "unable to cope with svn output"
 msgstr "incapaz de lidar com saída do svn"
 
-msgid "XXX TAGS NOT IMPLEMENTED YET\n"
-msgstr "XXX TAGS AINDA NÃO IMPLEMENTADAS\n"
+msgid "writing Subversion tags is not yet implemented\n"
+msgstr "a escrita de tags do Subversion ainda não foi implementada\n"
 
 msgid "automatically manage newlines in repository files"
 msgstr "gerencia automaticamente quebras de linha em arquivos no repositório"
@@ -2727,8 +2760,8 @@
 msgid "Signing %d:%s\n"
 msgstr "Assinando %d: %s\n"
 
-msgid "Error while signing"
-msgstr "Erro ao assinar"
+msgid "error while signing"
+msgstr "erro ao assinar"
 
 msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)"
 msgstr "a cópia de trabalho de .hgsigs foi mudada (por favor consolide .hgsigs manualmente ou use --force)"
@@ -2814,7 +2847,7 @@
 msgstr "mostra o patch"
 
 msgid "show the specified revision or range"
-msgstr "mostra a revisão ou seqüência de revisões especificada"
+msgstr "mostra a revisão ou sequência de revisões especificada"
 
 msgid "hg glog [OPTION]... [FILE]"
 msgstr "hg glog [OPÇÃO]... [ARQUIVO]"
@@ -2931,11 +2964,12 @@
 msgid ""
 "The :hg:`view` command will launch the hgk Tcl script. For this command\n"
 "to work, hgk must be in your search path. Alternately, you can specify\n"
-"the path to hgk in your .hgrc file::"
+"the path to hgk in your configuration file::"
 msgstr ""
 "O comando :hg:`view` irá lançar o script Tcl hgk. Para esse comando\n"
 "funcionar, hgk deve estar em seu caminho de busca. Alternativamente,\n"
-"você pode especificar o caminho para o hgk em seu arquivo .hgrc::"
+"você pode especificar o caminho para o hgk em seu arquivo de\n"
+"configuração::"
 
 msgid ""
 "  [hgk]\n"
@@ -3292,6 +3326,14 @@
 "distribuição em arquivos."
 
 msgid ""
+"Keywords expand to the changeset data pertaining to the latest change\n"
+"relative to the working directory parent of each file."
+msgstr ""
+"Palavras chave expandem para os dados da revisão correspondentes\n"
+"à última mudança relativa ao pai do diretório de trabalho de cada\n"
+"arquivo."
+
+msgid ""
 "Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n"
 "sections of hgrc files."
 msgstr ""
@@ -4272,7 +4314,7 @@
 msgstr "opção \"-e\" incompatível com \"-m\" ou \"-l\""
 
 msgid "diff of the current patch and subsequent modifications"
-msgstr "diff do patch atual e modificações subseqüentes"
+msgstr "diff do patch atual e modificações subsequentes"
 
 msgid ""
 "    Shows a diff which includes the current patch as well as any\n"
@@ -4326,9 +4368,6 @@
 msgid "qfold requires at least one patch name"
 msgstr "qfold requer ao menos um nome de patch"
 
-msgid "No patches applied"
-msgstr "Nenhum patch aplicado"
-
 #, python-format
 msgid "Skipping already folded patch %s"
 msgstr "Omitindo patch %s já incorporado"
@@ -4338,8 +4377,8 @@
 msgstr "qfold não pode incorporar o patch %s já aplicado"
 
 #, python-format
-msgid "Error folding patch %s"
-msgstr "Erro incorporando patch %s"
+msgid "error folding patch %s"
+msgstr "erro incorporando patch %s"
 
 msgid "push or pop patches until named patch is at top of stack"
 msgstr "empilha ou desempilha patches até que o patch nomeado esteja no topo"
@@ -4455,8 +4494,8 @@
 msgid "restore the queue state saved by a revision (DEPRECATED)"
 msgstr "restaura o estado da fila salvo por uma revisão (OBSOLETO)"
 
-msgid "    This command is deprecated, use rebase --mq instead."
-msgstr "    Este comando é obsoleto, use rebase --mq em seu lugar."
+msgid "    This command is deprecated, use :hg:`rebase` instead."
+msgstr "    Este comando é obsoleto, use :hg:`rebase` em seu lugar."
 
 msgid "save current queue state (DEPRECATED)"
 msgstr "salva o estado atual da fila (OBSOLETO)"
@@ -4643,7 +4682,7 @@
 "    control. Otherwise, the given revisions must be at the base of the\n"
 "    stack of applied patches."
 msgstr ""
-"    Aceita uma seqüência de revisões ou a opção -a/--applied. Se\n"
+"    Aceita uma sequência de revisões ou a opção -a/--applied. Se\n"
 "    --applied for especificado, todas as revisões mq aplicadas serão\n"
 "    removidas do controle da mq. De outro modo, as revisões pedidas\n"
 "    devem estar na base da pilha de patches aplicados."
@@ -4744,8 +4783,8 @@
 msgid "only a local queue repository may be initialized"
 msgstr "apenas um repositório de fila local pode ser inicializado"
 
-msgid "There is no Mercurial repository here (.hg not found)"
-msgstr "Não há um repositório do Mercurial aqui (.hg não encontrado)"
+msgid "there is no Mercurial repository here (.hg not found)"
+msgstr "não há um repositório do Mercurial aqui (.hg não encontrado)"
 
 msgid "no queue repository"
 msgstr "repositório da fila não existente"
@@ -4917,8 +4956,8 @@
 msgid "reorder patch series and apply only the patch"
 msgstr "reordena a fila de patches e aplica apenas o patch"
 
-msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]"
-msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOME] [--move] [PATCH | ÍNDICE]"
+msgid "hg qpush [-f] [-l] [-a] [-n NAME] [--move] [PATCH | INDEX]"
+msgstr "hg qpush [-f] [-l] [-a] [-n NOME] [--move] [PATCH | ÍNDICE]"
 
 msgid "refresh only files already in the patch and specified files"
 msgstr "renova apenas os arquivos especificados ou que já estão no patch"
@@ -5262,10 +5301,11 @@
 
 msgid ""
 "To ignore global commands like :hg:`version` or :hg:`help`, you have\n"
-"to specify them in the global .hgrc\n"
+"to specify them in your user configuration file.\n"
 msgstr ""
 "Para ignorar comandos globais como :hg:`version`ou :hg:`help`,\n"
-"você precisa especificá-los no .hgrc global.\n"
+"você precisa especificá-los no seu arquivo de configuração de\n"
+"usuário.\n"
 
 msgid "interpret suffixes to refer to ancestor revisions"
 msgstr "interpreta sufixos para referência a revisões ancestrais"
@@ -5342,7 +5382,7 @@
 msgstr ""
 "Cada mensagem faz referência à primeira da série usando os cabeçalhos\n"
 "In-Reply-To e References, de modo que as mensagens aparecerão como\n"
-"uma seqüência em e-mails organizados por conversação e leitores de\n"
+"uma sequência em e-mails organizados por conversação e leitores de\n"
 "notícias, além de mail archives."
 
 msgid ""
@@ -6212,7 +6252,7 @@
 "    hardlinks for any files touched by the new changesets, even if\n"
 "    both repositories end up pulling the same changes."
 msgstr ""
-"    Infelizmente, revisões subseqüentemente trazidas para qualquer dos\n"
+"    Infelizmente, revisões subsequentemente trazidas para qualquer dos\n"
 "    repositórios quebrarão os hardlinks de qualquer arquivo alterado\n"
 "    pelas novas revisões, mesmo que os repositórios acabem por trazer as\n"
 "    mesmas mudanças."
@@ -6462,8 +6502,8 @@
 msgid "%s: empty changeset"
 msgstr "%s: revisão vazia"
 
-msgid "Fix up the merge and run hg transplant --continue"
-msgstr "Conserte a mesclagem e execute hg transplant --continue"
+msgid "fix up the merge and run hg transplant --continue"
+msgstr "conserte a mesclagem e execute hg transplant --continue"
 
 #, python-format
 msgid "%s transplanted as %s\n"
@@ -6490,7 +6530,7 @@
 msgstr ""
 "y: transplante esta revisão\n"
 "n: pula esta revisão\n"
-"m: mescal nesta revisão\n"
+"m: mescla nesta revisão\n"
 "p: mostra o patch\n"
 "c: consolida revisões selecionadas\n"
 "q: cancela o transplante\n"
@@ -7737,10 +7777,10 @@
 "    pode ser especificado listando cada revisão (etiqueta, ou nome de\n"
 "    ramo) com -r/--rev. Se -r/--rev for usado, o repositório clonado irá\n"
 "    conter apenas um subconjunto das revisões do repositório de origem.\n"
-"    Apenas o conjunto de revisões definidas por todas as opçoes -r/--rev\n"
+"    Apenas o conjunto de revisões definidas por todas as opções -r/--rev\n"
 "    (incluindo todos os seus ancestrais) será trazido para o repositório\n"
-"    de destino. Nenhuma revisão subseqüente (incluindo etiquetas\n"
-"    subseqüentes) estará presente no repositório."
+"    de destino. Nenhuma revisão subsequente (incluindo etiquetas\n"
+"    subsequentes) estará presente no repositório."
 
 msgid ""
 "    Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n"
@@ -7835,7 +7875,7 @@
 "    :hg:`push` for a way to actively distribute your changes."
 msgstr ""
 "    Consolida no repositório local mudanças nos arquivos dados. Ao\n"
-"    contrário do que ocorre um sistema de controle de versão\n"
+"    contrário do que ocorre em um sistema de controle de versão\n"
 "    centralizado, esta operação é local. Veja :hg:`push` para um modo\n"
 "    de distribuir ativamente suas mudanças."
 
@@ -7854,11 +7894,15 @@
 "    forneça nenhum nome de arquivo ou filtros -I/-X ."
 
 msgid ""
-"    If no commit message is specified, the configured editor is\n"
-"    started to prompt you for a message."
-msgstr ""
-"    Se uma mensagem de consolidação não for especificada, o editor\n"
-"    configurado será iniciado para editar uma mensagem."
+"    If no commit message is specified, Mercurial starts your\n"
+"    configured editor where you can enter a message. In case your\n"
+"    commit fails, you will find a backup of your message in\n"
+"    ``.hg/last-message.txt``."
+msgstr ""
+"    Se não for passada uma mensagem de consolidação, o Mercurial inicia\n"
+"    o editor de texto configurado, para que você digite a mensagem. No\n"
+"    caso de a consolidação falhar, é criada uma cópia de segurança\n"
+"    dessa mensagem em ``.hg/last-message.txt``."
 
 msgid ""
 "    Returns 0 on success, 1 if nothing changed.\n"
@@ -7946,7 +7990,7 @@
 "     - \"!!my command\\n\" is like \"!\", but to the end of the line\n"
 "     - \"#...\\n\" is a comment up to the end of the line"
 msgstr ""
-"     - \"+n\" é uma seqüência linear de n nós baseada no pai default atual\n"
+"     - \"+n\" é uma sequência linear de n nós baseada no pai default atual\n"
 "     - \".\" é um único nó baseado no pai default atual\n"
 "     - \"$\" redefine o pai default para null (valor usado no início);\n"
 "           de outra maneira o pai default é sempre o último nó criado\n"
@@ -7978,11 +8022,11 @@
 
 msgid ""
 "    All string valued-elements are either strictly alphanumeric, or must\n"
-"    be enclosed in double quotes (\"...\"), with \"\" as escape character."
+"    be enclosed in double quotes (\"...\"), with \"\\\" as escape character."
 msgstr ""
 "    Todos os elementos com valores string devem ser ou estritamente\n"
 "    alfanuméricos, ou devem estar entre aspas duplas (\"...\"), usando\n"
-"    \"\" como caractere de escape."
+"    \"\\\" como caractere de escape."
 
 msgid ""
 "    Note that the --overwritten-file and --appended-file options imply the\n"
@@ -8183,8 +8227,8 @@
 msgid " patch test failed!\n"
 msgstr " patch de teste falhou!\n"
 
-msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n"
-msgstr " (O utilitário de patch atual pode ser incompatível com o patch, ou pode estar configurado incorretamente. Por favor verifique seu arquivo .hgrc)\n"
+msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your configuration file)\n"
+msgstr " (O utilitário de patch atual pode ser incompatível com o patch, ou pode estar configurado incorretamente. Por favor verifique seu arquivo de configuração)\n"
 
 msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n"
 msgstr " Falha do sistema interno de patches, por favor informe esse erro em http://mercurial.selenic.com/bts/\n"
@@ -8195,8 +8239,8 @@
 msgid " No commit editor set and can't find vi in PATH\n"
 msgstr " Nenhum editor para consolidação configurado, e não foi possível encontrar 'vi' no PATH\n"
 
-msgid " (specify a commit editor in your .hgrc file)\n"
-msgstr " (especifique um editor para consolidação em seu arquivo .hgrc)\n"
+msgid " (specify a commit editor in your configuration file)\n"
+msgstr " (especifique um editor para consolidação em seu arquivo de configuração)\n"
 
 #, python-format
 msgid " Can't find editor '%s' in PATH\n"
@@ -8205,8 +8249,8 @@
 msgid "Checking username...\n"
 msgstr "Verificando nome de usuário...\n"
 
-msgid " (specify a username in your .hgrc file)\n"
-msgstr " (especifique um nome de usuário em seu arquivo .hgrc)\n"
+msgid " (specify a username in your configuration file)\n"
+msgstr " (especifique um nome de usuário em seu arquivo de configuração)\n"
 
 msgid "No problems detected\n"
 msgstr "Nenhum problema detectado\n"
@@ -8322,7 +8366,7 @@
 "    :``%R``: número de ordem da revisão\n"
 "    :``%b``: nome base do repositório onde o export é realizado\n"
 "    :``%h``: hash de forma curta da revisão (12 bytes hexadecimais)\n"
-"    :``%n``: número seqüencial completado com zeros, começando em 1\n"
+"    :``%n``: número sequencial completado com zeros, começando em 1\n"
 "    :``%r``: número de ordem da revisão completado com zeros"
 
 msgid ""
@@ -9030,12 +9074,12 @@
 "    fornecido, mostra todas as definições de nomes disponíveis."
 
 msgid ""
-"    Path names are defined in the [paths] section of\n"
-"    ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n"
+"    Path names are defined in the [paths] section of your\n"
+"    configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n"
 "    repository, ``.hg/hgrc`` is used, too."
 msgstr ""
-"    Nomes de caminho são definidos na seção [paths] de\n"
-"    ``/etc/mercurial/hgrc`` e ``$HOME/.hgrc``. Se executado em um\n"
+"    Nomes de caminho são definidos na seção [paths] de seu arquivo\n"
+"    de configuração e em ``/etc/mercurial/hgrc``. Se executado em um\n"
 "    repositório, ``.hg/hgrc`` também será usado."
 
 msgid ""
@@ -9120,6 +9164,9 @@
 "    em arquivos não resolvidos.\n"
 "    "
 
+msgid "other repository doesn't support revision lookup, so a rev cannot be specified."
+msgstr "o outro repositório não suporta busca por revisão, portanto uma revisão não pode ser especificada."
+
 msgid "push changes to the specified destination"
 msgstr "envia mudanças para o destino especificado"
 
@@ -9280,17 +9327,16 @@
 msgstr "arquivo %s não removido: arquivo não rastreado\n"
 
 #, python-format
-msgid "not removing %s: file %s (use -f to force removal)\n"
-msgstr "arquivo %s não removido: %s (use -f para forçar a remoção)\n"
-
-msgid "still exists"
-msgstr "ainda existe"
+msgid "not removing %s: file still exists (use -f to force removal)\n"
+msgstr "%s não removido: o arquivo ainda existe (use -f para forçar a remoção)\n"
 
-msgid "is modified"
-msgstr "alterado"
+#, python-format
+msgid "not removing %s: file is modified (use -f to force removal)\n"
+msgstr "%s não removido: o arquivo foi modificado (use -f para forçar a remoção)\n"
 
-msgid "has been marked for add"
-msgstr "foi marcado para adição"
+#, python-format
+msgid "not removing %s: file has been marked for add (use -f to force removal)\n"
+msgstr "%s não removido: o arquivo foi marcado para adição (use -f para forçar a remoção)\n"
 
 msgid "rename files; equivalent of copy + remove"
 msgstr "renomeia arquivos; equivalente a uma cópia seguida de remoção"
@@ -9311,68 +9357,79 @@
 "    Este comando faz efeito na próxima consolidação. Para desfazer\n"
 "    uma renomeação antes disso, veja :hg:`revert`."
 
-msgid "various operations to help finish a merge"
-msgstr "diversas operações para auxiliar a execução de uma mesclagem"
+msgid "redo merges or set/view the merge status of files"
+msgstr "refaz mesclagens e exibe ou muda o estado da mesclagem de arquivos"
+
+msgid ""
+"    Merges with unresolved conflicts are often the result of\n"
+"    non-interactive merging using the ``internal:merge`` configuration\n"
+"    setting, or a command-line merge tool like ``diff3``. The resolve\n"
+"    command is used to manage the files involved in a merge, after\n"
+"    :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n"
+"    working directory must have two parents)."
+msgstr ""
+"    Mesclagens com conflitos não resolvidos podem resultar de mesclagens não\n"
+"    interativas usando a opção ``internal:merge`` do arquivo de configuração\n"
+"    ou um utilitário de mesclagem de linha de comando, como o ``diff3``.\n"
+"    O comando resolve é usado para gerenciar os arquivos envolvidos em uma\n"
+"    mesclagem após a execução de :hg:`merge` e antes da execução de\n"
+"    :hg:`commit` (ou seja, enquanto o diretório de trabalho tiver dois\n"
+"    pais)."
+
+msgid "    The resolve command can be used in the following ways:"
+msgstr "    O comando resolve pode ser usado das seguintes maneiras:"
+
+msgid ""
+"    - :hg:`resolve FILE...`: attempt to re-merge the specified files,\n"
+"      discarding any previous merge attempts. Re-merging is not\n"
+"      performed for files already marked as resolved. Use ``--all/-a``\n"
+"      to selects all unresolved files."
+msgstr ""
+"    - :hg:`resolve ARQUIVO...`: tenta refazer a mesclagem dos arquivos\n"
+"      especificados, descartando qualquer tentativa de mesclagem anterior.\n"
+"      Essa nova tentativa não será feita em arquivos já marcados como\n"
+"      resolvidos. Use ``--all/-a`` para indicar todos os arquivos não\n"
+"      resolvidos."
+
+msgid ""
+"    - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n"
+"      (e.g. after having manually fixed-up the files). The default is\n"
+"      to mark all unresolved files."
+msgstr ""
+"    - :hg:`resolve -m [ARQUIVO]`: marca um arquivo como resolvido (por\n"
+"      exemplo, após correção manual do arquivo). O padrão é marcar todos\n"
+"      os arquivos não resolvidos."
+
+msgid ""
+"    - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The\n"
+"      default is to mark all resolved files."
+msgstr ""
+"    - :hg:`resolve -u [ARQUIVO]...`: marca um arquivo como não resolvido.\n"
+"      O padrão é marcar todos os arquivos resolvidos."
+
+msgid ""
+"    - :hg:`resolve -l`: list files which had or still have conflicts.\n"
+"      In the printed list, ``U`` = unresolved and ``R`` = resolved."
+msgstr ""
+"    - :hg:`resolve -l`: lista os arquivos que já tiveram ou ainda têm\n"
+"      conflitos. Na lista impressa, ``U`` significa não resolvido, e\n"
+"      ``R`` resolvido."
 
 msgid ""
-"    This command includes several actions that are often useful while\n"
-"    performing a merge, after running ``merge`` but before running\n"
-"    ``commit``.  (It is only meaningful if your working directory has\n"
-"    two parents.)  It is most relevant for merges with unresolved\n"
-"    conflicts, which are typically a result of non-interactive merging with\n"
-"    ``internal:merge`` or a command-line merge tool like ``diff3``."
-msgstr ""
-"    Este comando inclui diversas ações úteis para realizar uma mesclagem,\n"
-"    após a execução de ``merge`` mas antes da execução de ``commit`` (só\n"
-"    faz sentido se seu diretório de trabalho tiver dois pais). É mais\n"
-"    relevante para mesclagens com conflitos não resolvidos, que tipicamente\n"
-"    resultam de mesclagem não interativa usando ``internal:merge`` ou um\n"
-"    utilitário de mesclagem de linha de comando, como o ``diff3``."
-
-msgid "    The available actions are:"
-msgstr "    As ações disponíveis são:"
-
-msgid ""
-"      1) list files that were merged with conflicts (U, for unresolved)\n"
-"         and without conflicts (R, for resolved): ``hg resolve -l``\n"
-"         (this is like ``status`` for merges)\n"
-"      2) record that you have resolved conflicts in certain files:\n"
-"         ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n"
-"      3) forget that you have resolved conflicts in certain files:\n"
-"         ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n"
-"      4) discard your current attempt(s) at resolving conflicts and\n"
-"         restart the merge from scratch: ``hg resolve file...``\n"
-"         (or ``-a`` for all unresolved files)"
-msgstr ""
-"      1) listar arquivos que foram mesclados com conflitos (marcando-os com\n"
-"         U, chamados de 'não resolvidos') ou sem conflitos (R, de\n"
-"         'resolvidos'): ``hg resolve -l`` (isto é semelhante ao comando\n"
-"         ``status``, mas específico para mesclagens)\n"
-"      2) registrar que você resolveu conflitos em certos arquivos:\n"
-"         ``hg resolve -m [arquivo ...]`` (por padrão marca todos os\n"
-"         arquivos não resolvidos)\n"
-"      3) esquecer que você resolveu conflitos em certos arquivos:\n"
-"         ``hg resolve -u [arquivo ...]`` (por padrão desmarca todos os\n"
-"         arquivos resolvidos)\n"
-"      4) descartar sua tentativa atual de resolver conflitos e recomeçar\n"
-"         do início: ``hg resolve arquivo...`` (ou ``-a`` para todos os\n"
-"         arquivos não resolvidos)"
-
-msgid ""
-"    Note that Mercurial will not let you commit files with unresolved merge\n"
-"    conflicts.  You must use ``hg resolve -m ...`` before you can commit\n"
-"    after a conflicting merge."
+"    Note that Mercurial will not let you commit files with unresolved\n"
+"    merge conflicts. You must use :hg:`resolve -m ...` before you can\n"
+"    commit after a conflicting merge."
 msgstr ""
 "    Note que o Mercurial não deixará que você faça a consolidação de\n"
-"    arquivos com conflitos de mesclagem não resolvidos. Você deve usar\n"
-"    ``hg resolve -m ...`` após uma mesclagem com conflitos para que você\n"
-"    possa consolidar o resultado."
+"    arquivos com conflitos de mesclagem não resolvidos. Você precisa\n"
+"    primeiro usar ``hg resolve -m ...`` para indicar os conflitos como\n"
+"    resolvidos."
 
 msgid ""
 "    Returns 0 on success, 1 if any files fail a resolve attempt.\n"
 "    "
 msgstr ""
-"    Devolve 0 para indicar successo, 1 se a resolução de algum\n"
+"    Devolve 0 para indicar sucesso, 1 se a resolução de algum\n"
 "    arquivo falhar.\n"
 "    "
 
@@ -9607,6 +9664,9 @@
 "    especifique a porta como 0; nesse caso, o servidor irá imprimir\n"
 "    o número da porta que ele usar."
 
+msgid "There is no Mercurial repository here (.hg not found)"
+msgstr "Não há um repositório do Mercurial aqui (.hg não encontrado)"
+
 #, python-format
 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
 msgstr "ouvindo em http://%s%s/%s (associado a %s:%d)\n"
@@ -10446,7 +10506,7 @@
 msgstr "imprime número de linhas que casarem"
 
 msgid "only search files changed within revision range"
-msgstr "procura apenas opr arquivos que mudaram dentro do intervalo pedido"
+msgstr "procura apenas por arquivos que mudaram dentro do intervalo pedido"
 
 msgid "[OPTION]... PATTERN [FILE]..."
 msgstr "[OPÇÃO]... PADRÃO [ARQUIVO]..."
@@ -10457,8 +10517,8 @@
 msgid "show topological heads only"
 msgstr "mostra apenas cabeças topológicas"
 
-msgid "show active branchheads only [DEPRECATED]"
-msgstr "mostra apenas cabeças de ramo ativas [OBSOLETA]"
+msgid "show active branchheads only (DEPRECATED)"
+msgstr "mostra apenas cabeças de ramo ativas (OBSOLETA)"
 
 msgid "show normal and closed branch heads"
 msgstr "mostra cabeças de ramo normais e fechadas"
@@ -10650,10 +10710,10 @@
 msgstr "lista estado de arquivos que precisam ser mesclados"
 
 msgid "mark files as resolved"
-msgstr "marca arquivos como solucionados"
+msgstr "marca arquivos como resolvidos"
 
-msgid "unmark files as resolved"
-msgstr "desmarca arquivos como solucionados"
+msgid "mark files as unresolved"
+msgstr "marca arquivos como não resolvidos"
 
 msgid "hide status prefix"
 msgstr "esconde prefixo de status"
@@ -10803,6 +10863,10 @@
 msgid "not found in manifest"
 msgstr "não encontrado no manifesto"
 
+#, python-format
+msgid "no such file in rev %s"
+msgstr "não há tal arquivo na revisão %s"
+
 msgid "branch name not in UTF-8!"
 msgstr "nome do ramo não está em UTF-8!"
 
@@ -10847,6 +10911,18 @@
 msgstr "cópia falhou: %s não é um arquivo ou um link simbólico\n"
 
 #, python-format
+msgid "invalid character in dag description: %s..."
+msgstr "caractere inválido na descrição do dag: %s..."
+
+#, python-format
+msgid "expected id %i, got %i"
+msgstr "esperado id %i, obtido %i"
+
+#, python-format
+msgid "parent id %i is larger than current id %i"
+msgstr "id do pai %i é maior que o id atual %i"
+
+#, python-format
 msgid "invalid event type in dag: %s"
 msgstr "tipo de entrada inválido no dag: %s"
 
@@ -11066,11 +11142,11 @@
 msgid "extension '%s' overrides commands: %s\n"
 msgstr "a extensão '%s' sobrepõe o comando: %s\n"
 
-msgid "Option --config may not be abbreviated!"
-msgstr "A opção --config não pode ser abreviada!"
+msgid "option --config may not be abbreviated!"
+msgstr "a opção --config não pode ser abreviada!"
 
-msgid "Option --cwd may not be abbreviated!"
-msgstr "A opção --cwd não pode ser abreviada!"
+msgid "option --cwd may not be abbreviated!"
+msgstr "a opção --cwd não pode ser abreviada!"
 
 msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!"
 msgstr "A opção -R deve ser separada de outras opções (por exemplo, não usar -qR) e --repository pode ser abreviada apenas como --repo!"
@@ -11168,9 +11244,12 @@
 msgid "merging %s failed!\n"
 msgstr "mesclagem de %s falhou!\n"
 
+msgid "starting revisions are not directly related"
+msgstr "as revisões iniciais não são diretamente relacionadas"
+
 #, python-format
-msgid "Inconsistent state, %s:%s is good and bad"
-msgstr "Estado inconsistente, %s:%s é bom e ruim"
+msgid "inconsistent state, %s:%s is good and bad"
+msgstr "estado inconsistente, %s:%s é bom e ruim"
 
 #, python-format
 msgid "unknown bisect kind %s"
@@ -11222,7 +11301,7 @@
 "Mercurial reads configuration data from several files, if they exist.\n"
 "Below we list the most specific file first."
 msgstr ""
-"O Mercurial lê dados de configuração de váris arquivos, se existirem.\n"
+"O Mercurial lê dados de configuração de vários arquivos, se existirem.\n"
 "Abaixo listamos os arquivos mais específicos primeiro."
 
 msgid "On Windows, these configuration files are read:"
@@ -11361,8 +11440,8 @@
 "- ``Dec 6 13:18 -0600`` (ano atual, defasagem de horário local fornecida)\n"
 "- ``Dec 6 13:18 UTC`` (UTC e GMT são apelidos para +0000)\n"
 "- ``Dec 6`` (meia noite)\n"
-"- ``13:18`` (data corrente assumida)\n"
-"- ``3:39`` (hora assumida 3:39AM)\n"
+"- ``13:18`` (assume a data atual)\n"
+"- ``3:39`` (assume 3:39AM)\n"
 "- ``3:39pm`` (15:39)\n"
 "- ``2006-12-06 13:18:29`` (formato ISO 8601)\n"
 "- ``2006-12-6 13:18``\n"
@@ -11462,14 +11541,14 @@
 msgid ""
 "To make Mercurial produce the git extended diff format, use the --git\n"
 "option available for many commands, or set 'git = True' in the [diff]\n"
-"section of your hgrc. You do not need to set this option when\n"
-"importing diffs in this format or using them in the mq extension.\n"
+"section of your configuration file. You do not need to set this option\n"
+"when importing diffs in this format or using them in the mq extension.\n"
 msgstr ""
 "Para fazer com que o Mercurial produza o formato estendido git\n"
 "diff, use a opção --git disponível para vários comandos, ou\n"
-"defina 'git = True' na seção [diff] de seu hgrc. Você não precisa\n"
-"definir essa opção para importar diffs nesse formato, nem para\n"
-"usá-lo com a extensão mq.\n"
+"defina 'git = True' na seção [diff] de seu arquivo de configuração.\n"
+"Você não precisa definir essa opção para importar diffs nesse formato,\n"
+"nem para usá-lo com a extensão mq.\n"
 
 msgid ""
 "HG\n"
@@ -11492,8 +11571,8 @@
 "HGEDITOR\n"
 "    Este é o nome do editor usado em consolidações. Veja EDITOR."
 
-msgid "    (deprecated, use .hgrc)"
-msgstr "    (obsoleto, use .hgrc)"
+msgid "    (deprecated, use configuration file)"
+msgstr "    (obsoleto, use o arquivo de configuração)"
 
 msgid ""
 "HGENCODING\n"
@@ -11534,22 +11613,22 @@
 "    ancestor file."
 msgstr ""
 "HGMERGE\n"
-"    Um executável a ser usado para solucionar conflitos de mesclagem.\n"
+"    Um executável a ser usado para resolver conflitos de mesclagem.\n"
 "    O programa será executado com três argumentos: arquivo local,\n"
 "    arquivo remoto, arquivo ancestral."
 
 msgid ""
 "HGRCPATH\n"
-"    A list of files or directories to search for hgrc files. Item\n"
-"    separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
-"    platform default search path is used. If empty, only the .hg/hgrc\n"
-"    from the current repository is read."
+"    A list of files or directories to search for configuration\n"
+"    files. Item separator is \":\" on Unix, \";\" on Windows. If HGRCPATH\n"
+"    is not set, platform default search path is used. If empty, only\n"
+"    the .hg/hgrc from the current repository is read."
 msgstr ""
 "HGRCPATH\n"
-"    Uma lista de arquivos ou diretórios onde procurar arquivos hgrc.\n"
-"    O separador de itens é \":\" em Unix, \";\" no Windows. Se\n"
-"    HGRCPATH não estiver definido, o caminho de busca padrão da\n"
-"    plataforma será usado. Se vazio, será lido apenas .hg/hgrc no\n"
+"    Uma lista de arquivos ou diretórios onde procurar por arquivos de\n"
+"    configuração. O separador de itens é \":\" em Unix, \";\" no\n"
+"    Windows. Se HGRCPATH não estiver definido, o caminho de busca padrão\n"
+"    da plataforma será usado. Se vazio, será lido apenas o .hg/hgrc no\n"
 "    repositório atual."
 
 msgid "    For each element in HGRCPATH:"
@@ -11565,18 +11644,18 @@
 
 msgid ""
 "HGPLAIN\n"
-"    When set, this disables any options in .hgrc that might change\n"
-"    Mercurial's default output. This includes encoding, defaults,\n"
-"    verbose mode, debug mode, quiet mode, tracebacks, and\n"
+"    When set, this disables any configuration settings that might\n"
+"    change Mercurial's default output. This includes encoding,\n"
+"    defaults, verbose mode, debug mode, quiet mode, tracebacks, and\n"
 "    localization. This can be useful when scripting against Mercurial\n"
 "    in the face of existing user configuration."
 msgstr ""
 "HGPLAIN\n"
-"    Se definido, desabilita qualquer opção em .hgrc que possa mudar\n"
+"    Se definido, desabilita qualquer opção de configuração que possa mudar\n"
 "    a saída padrão do Mercurial. Isto inclui codificação, seção defaults,\n"
 "    modo verboso, modo debug, modo silencioso, adições de tracebacks\n"
 "    e localização. Isto pode ser útil para a inclusão do Mercurial em\n"
-"    scipts para compensar mudanças de configuração feitas pelo usuário."
+"    scripts para compensar mudanças de configuração feitas pelo usuário."
 
 msgid ""
 "    Equivalent options set via command line flags or environment\n"
@@ -11597,13 +11676,13 @@
 
 msgid ""
 "    - HGUSER (deprecated)\n"
-"    - hgrc files from the HGRCPATH\n"
+"    - configuration files from the HGRCPATH\n"
 "    - EMAIL\n"
 "    - interactive prompt\n"
 "    - LOGNAME (with ``@hostname`` appended)"
 msgstr ""
 "    - HGUSER (obsoleto)\n"
-"    - arquivos hgrc no HGRCPATH\n"
+"    - arquivos de configuração no HGRCPATH\n"
 "    - EMAIL\n"
 "    - consulta interativa\n"
 "    - LOGNAME (com ``@hostname`` anexado)"
@@ -11686,13 +11765,13 @@
 "usuário ativar extensões como desejar."
 
 msgid ""
-"To enable the \"foo\" extension, either shipped with Mercurial or in\n"
-"the Python search path, create an entry for it in your hgrc, like\n"
-"this::"
+"To enable the \"foo\" extension, either shipped with Mercurial or in the\n"
+"Python search path, create an entry for it in your configuration file,\n"
+"like this::"
 msgstr ""
 "Para habilitar a extensão \"foo\", tanto se for distribuída com\n"
 "o Mercurial como estiver no caminho de busca do Python, crie uma\n"
-"entrada para ela em seu hgrc, da seguinte forma::"
+"entrada para ela em seu arquivo de configuração, da seguinte forma::"
 
 msgid ""
 "  [extensions]\n"
@@ -11714,11 +11793,11 @@
 "  myfeature = ~/.hgext/myfeature.py"
 
 msgid ""
-"To explicitly disable an extension enabled in an hgrc of broader\n"
-"scope, prepend its path with !::"
+"To explicitly disable an extension enabled in a configuration file of\n"
+"broader scope, prepend its path with !::"
 msgstr ""
 "Para desabilitar explicitamente uma extensão habilitada em um\n"
-"hgrc de escopo mais amplo, prefixe seu caminho com !::"
+"arquivo de configuração de escopo mais amplo, prefixe seu caminho com !::"
 
 msgid ""
 "  [extensions]\n"
@@ -11760,11 +11839,11 @@
 msgstr ""
 "Branch\n"
 "    (Nome) Ramo. Uma revisão filha que foi criada a partir de um pai que\n"
-"    não seja uma cabeça. Estes ão conhecidos como ramos topológicos; veja\n"
+"    não seja uma cabeça. Estes são conhecidos como ramos topológicos; veja\n"
 "    'Branch, topological'. Se um ramo topológico tiver um nome, ele pode\n"
 "    ser chamado de ramo nomeado. Se um ramo topológico não tiver um nome,\n"
 "    ele pode ser chamado de ramo anônimo. Veja 'Branch, anonymous' e\n"
-"   'Branch, named'."
+"    'Branch, named'."
 
 msgid ""
 "    Branches may be created when changes are pulled from or pushed to\n"
@@ -11837,6 +11916,30 @@
 "    Veja 'Head, branch'."
 
 msgid ""
+"Branch, inactive\n"
+"    If a named branch has no topological heads, it is considered to be\n"
+"    inactive. As an example, a feature branch becomes inactive when it\n"
+"    is merged into the default branch. The :hg:`branches` command\n"
+"    shows inactive branches by default, though they can be hidden with\n"
+"    :hg:`branches --active`."
+msgstr ""
+"Branch, inactive\n"
+"    Ramo inativo. Um ramo nomeado é considerado inativo se ele não tiver\n"
+"    cabeças topológicas. Por exemplo, um \"feature branch\" (ramo de\n"
+"    implementação) se torna inativo quando for mesclado com o ramo default.\n"
+"    O comando :hg:`branches` mostra ramos inativos por padrão, mas eles\n"
+"    podem ser ocultados usando :hg:`branches --active`."
+
+msgid ""
+"    NOTE: this concept is deprecated because it is too implicit.\n"
+"    Branches should now be explicitly closed using :hg:`commit\n"
+"    --close-branch` when they are no longer needed."
+msgstr ""
+"    NOTA: este conceito foi tornado obsoleto por ser demasiado implícito.\n"
+"    Atualmente, quando não forem mais necessários, ramos nomeados devem\n"
+"    ser fechados explicitamente usando :hg:`commit --close-branch`."
+
+msgid ""
 "Branch, named\n"
 "    A collection of changesets which have the same branch name. By\n"
 "    default, children of a changeset in a named branch belong to the\n"
@@ -12240,7 +12343,7 @@
 msgstr ""
 "History, immutable\n"
 "    Histórico imutável. Uma vez consolidada, uma revisão não pode ser\n"
-"    alterada. Extensões que se propõe a alterar o histórico (veja\n"
+"    alterada. Extensões que se propõem a alterar o histórico (veja\n"
 "    'History, rewriting') na verdade criam novas revisões substituindo\n"
 "    as revisões existentes.\n"
 "    Este tipo de operação faz mais sentido em repositórios privados:\n"
@@ -12518,7 +12621,7 @@
 "Tip, branch\n"
 "    A ponta de um ramo. É a cabeça de um determinado ramo com o maior\n"
 "    número de revisão. Quando um nome de ramo é usado como identificador\n"
-"    de revisão, ele se refer à ponta do ramo.\n"
+"    de revisão, ele se refere à ponta do ramo.\n"
 "    Veja também 'Branch, head'. Note que a ponta do ramo pode ser diferente\n"
 "    em diferentes clones de um repositório, já que os números de revisão\n"
 "    podem não ser os mesmos."
@@ -12538,7 +12641,7 @@
 "    the working directory to that of a specific changeset. See\n"
 "    :hg:`help update`."
 msgstr ""
-"    (Verb) Atualizar. Esse termo é tipicamente usado para descrever\n"
+"    (Verbo) Atualizar. Esse termo é tipicamente usado para descrever\n"
 "    a mudança do estado do diretório de trabalho para uma revisão\n"
 "    específica qualquer. Veja :hg:`help update`."
 
@@ -12671,7 +12774,7 @@
 "separated by the \":\" character."
 msgstr ""
 "Quando o Mercurial aceita mais de uma revisão, elas podem ser\n"
-"especificadas individualmente, ou fornecidas como uma seqüência\n"
+"especificadas individualmente, ou fornecidas como uma sequência\n"
 "topologicamente contínua, separadas pelo caractere \":\"."
 
 msgid ""
@@ -12680,11 +12783,11 @@
 "specified, it defaults to revision number 0. If END is not specified,\n"
 "it defaults to the tip. The range \":\" thus means \"all revisions\"."
 msgstr ""
-"A sintaxe da notação de seqüência é [INÍCIO]:[FIM], onde INÍCIO\n"
+"A sintaxe da notação de sequência é [INÍCIO]:[FIM], onde INÍCIO\n"
 "e FIM são identificadores de revisão. Tanto INÍCIO como FIM são\n"
 "opcionais. Se INÍCIO não for especificado, terá como valor padrão\n"
 "a revisão número 0. Se FIM não for especificado, terá como valor\n"
-"padrão a revisão tip. A seqüência \":\" portanto significa\n"
+"padrão a revisão tip. A sequência \":\" portanto significa\n"
 "\"todas as revisões\"."
 
 msgid "If BEGIN is greater than END, revisions are treated in reverse order."
@@ -12696,9 +12799,9 @@
 "A range acts as a closed interval. This means that a range of 3:5\n"
 "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
 msgstr ""
-"Uma seqüência age como um intervalo fechado. Isso quer dizer que\n"
-"uma seqüência 3:5 nos dá 3, 4 e 5. De forma semelhante, uma\n"
-"seqüência 4:2 nos dá 4, 3, e 2.\n"
+"Uma sequência age como um intervalo fechado. Isso quer dizer que\n"
+"uma sequência 3:5 nos dá 3, 4 e 5. De forma semelhante, uma\n"
+"sequência 4:2 nos dá 4, 3, e 2.\n"
 
 msgid ""
 "Mercurial accepts several notations for identifying one or more files\n"
@@ -12932,7 +13035,7 @@
 msgstr ""
 "``x:y``\n"
 "  Todas as revisões com números de revisão entre x e y, inclusive.\n"
-"  Os extremos podem ser omitidos: os valores padão são 0 e tip."
+"  Os extremos podem ser omitidos: os valores padrão são 0 e tip."
 
 msgid ""
 "``x and y``\n"
@@ -13179,7 +13282,7 @@
 "  - ``user`` for user name (``author`` can be used as an alias),\n"
 "  - ``date`` for the commit date"
 msgstr ""
-"  - ``rev`` para o número de reviosão,\n"
+"  - ``rev`` para o número de revisão,\n"
 "  - ``branch`` para o nome do ramo,\n"
 "  - ``desc`` para a mensagem de consolidação (descrição),\n"
 "  - ``user`` para o nome do usuário (``author`` também pode ser usado),\n"
@@ -13513,7 +13616,7 @@
 "    XML entities."
 msgstr ""
 ":obfuscate: Qualquer texto. Devolve o texto de entrada\n"
-"    renderizado como uma seqüência de entidades XML."
+"    renderizado como uma sequência de entidades XML."
 
 msgid ":person: Any text. Returns the text before an email address."
 msgstr ""
@@ -13546,6 +13649,13 @@
 msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
 msgstr ":shortdate: Data. Devolve uma data como \"2006-09-18\"."
 
+msgid ""
+":stringify: Any type. Turns the value into text by converting values into\n"
+"    text and concatenating them."
+msgstr ""
+":stringify: Qualquer tipo. Transforma o valor em texto convertendo cada\n"
+"    parte em texto e concatenando os resultados."
+
 msgid ":strip: Any text. Strips all leading and trailing whitespace."
 msgstr ""
 ":strip: Qualquer texto. Remove todos os espaços em branco no\n"
@@ -13615,6 +13725,13 @@
 "são possíveis apenas se forem explicitamente habilitadas no\n"
 "servidor remoto do Mercurial."
 
+msgid ""
+"Note that the security of HTTPS URLs depends on proper configuration of\n"
+"web.cacerts."
+msgstr ""
+"Note que a segurança de URLs HTTPS depende de uma configuração\n"
+"adequada de web.cacerts."
+
 msgid "Some notes about using SSH with Mercurial:"
 msgstr "Algumas notas sobre o uso de SSH com o Mercurial:"
 
@@ -13654,18 +13771,18 @@
 "      Compression yes"
 
 msgid ""
-"  Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
-"  with the --ssh command line option."
+"  Alternatively specify \"ssh -C\" as your ssh command in your\n"
+"  configuration file or with the --ssh command line option."
 msgstr ""
 "  Alternativamente especifique \"ssh -C\" como seu comando ssh\n"
-"  em seu hgrc ou pela opção de linha de comando --ssh ."
+"  em seu arquivo de configuração ou pela opção de linha de comando --ssh ."
 
 msgid ""
-"These URLs can all be stored in your hgrc with path aliases under the\n"
-"[paths] section like so::"
+"These URLs can all be stored in your configuration file with path\n"
+"aliases under the [paths] section like so::"
 msgstr ""
-"Estas URLs podem ser todas armazenadas em seu hgrc com apelidos\n"
-"de caminho na seção [paths] , da seguinte forma::"
+"Estas URLs podem ser todas armazenadas em seu arquivo de configuração\n"
+"com apelidos de caminho na seção [paths] , da seguinte forma::"
 
 msgid ""
 "  [paths]\n"
@@ -13773,6 +13890,10 @@
 msgid "error reading %s/.hg/hgrc: %s\n"
 msgstr "erro ao ler %s/.hg/hgrc: %s\n"
 
+#, python-format
+msgid "error accessing repository at %s\n"
+msgstr "erro ao acessar o repositório em %s\n"
+
 msgid "SSL support is unavailable"
 msgstr "Suporte a SSL indisponível"
 
@@ -14017,8 +14138,8 @@
 msgid "requesting all changes\n"
 msgstr "pedindo todas as mudanças\n"
 
-msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset."
-msgstr "Pull parcial não pode ser feito porque o outro repositório não suporta 'changegroupsubset'."
+msgid "partial pull cannot be done because other repository doesn't support changegroupsubset."
+msgstr "pull parcial não pode ser feito porque o outro repositório não suporta 'changegroupsubset'."
 
 #, python-format
 msgid "%d changesets found\n"
@@ -14096,8 +14217,8 @@
 msgid "transferred %s in %.1f seconds (%s/sec)\n"
 msgstr "transferidos %s em %.1f segundos (%s/s)\n"
 
-msgid "no [smtp]host in hgrc - cannot send mail"
-msgstr "nenhum servidor smtp ('host' em '[smtp]') no hgrc - impossível enviar e-mail"
+msgid "smtp.host not configured - cannot send mail"
+msgstr "servidor smtp não configurado - impossível enviar e-mail"
 
 #, python-format
 msgid "sending mail: smtp host %s, port %s\n"
@@ -14141,6 +14262,13 @@
 msgstr "falha ao remover %s do manifesto"
 
 #, python-format
+msgid "invalid pattern (%s): %s"
+msgstr "padrão inválido (%s): %s"
+
+msgid "invalid pattern"
+msgstr "padrão inválido"
+
+#, python-format
 msgid "diff context lines count must be an integer, not %r"
 msgstr "o número de linhas de contexto de diff deve ser um inteiro, e não %r"
 
@@ -14310,8 +14438,8 @@
 msgstr "comando de patch falhou: %s"
 
 #, python-format
-msgid "Unsupported line endings type: %s"
-msgstr "Tipo de quebra de linha não suportado: %s"
+msgid "unsupported line endings type: %s"
+msgstr "tipo de quebra de linha não suportado: %s"
 
 msgid ""
 "internal patcher failed\n"
@@ -14446,6 +14574,10 @@
 msgid "grep wants a string"
 msgstr "grep exige uma string"
 
+#, python-format
+msgid "invalid match pattern: %s"
+msgstr "padrão de busca inválido: %s"
+
 msgid "author wants a string"
 msgstr "author exige uma string"
 
@@ -14725,8 +14857,31 @@
 msgid "certificate checking requires Python 2.6"
 msgstr "verificação de certificado exige Python 2.6"
 
-msgid "server identity verification succeeded\n"
-msgstr "verificação de identidade do servidor feita com sucesso\n"
+msgid "no certificate received"
+msgstr "nenhum certificado recebido"
+
+#, python-format
+msgid "certificate expired %s"
+msgstr "o certificado expirou em %s"
+
+#, python-format
+msgid "certificate not valid before %s"
+msgstr "o certificado não é válido antes de %s"
+
+#, python-format
+msgid "certificate is for %s"
+msgstr "o certificado é para %s"
+
+msgid "no commonName found in certificate"
+msgstr "nenhum commonName encontrado no certificado"
+
+#, python-format
+msgid "%s certificate error: %s"
+msgstr "erro no certificado de %s: %s"
+
+#, python-format
+msgid "%s certificate successfully verified\n"
+msgstr "certificado %s verificado com sucesso\n"
 
 #, python-format
 msgid "command '%s' failed: %s"
diff -Nru mercurial-1.6.2/mercurial/archival.py mercurial-1.6.4/mercurial/archival.py
--- mercurial-1.6.2/mercurial/archival.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/archival.py	2010-10-01 15:18:50.000000000 +0000
@@ -139,6 +139,13 @@
         self.z = zipfile.ZipFile(dest, 'w',
                                  compress and zipfile.ZIP_DEFLATED or
                                  zipfile.ZIP_STORED)
+
+        # Python's zipfile module emits deprecation warnings if we try
+        # to store files with a date before 1980.
+        epoch = 315532800 # calendar.timegm((1980, 1, 1, 0, 0, 0, 1, 1, 0))
+        if mtime < epoch:
+            mtime = epoch
+
         self.date_time = time.gmtime(mtime)[:6]
 
     def addfile(self, name, mode, islink, data):
diff -Nru mercurial-1.6.2/mercurial/cmdutil.py mercurial-1.6.4/mercurial/cmdutil.py
--- mercurial-1.6.2/mercurial/cmdutil.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/cmdutil.py	2010-10-01 15:18:50.000000000 +0000
@@ -378,7 +378,7 @@
             return
 
         # check for overwrites
-        exists = os.path.exists(target)
+        exists = os.path.lexists(target)
         if not after and exists or after and state in 'mn':
             if not opts['force']:
                 ui.warn(_('%s: not overwriting - file exists\n') %
@@ -663,7 +663,7 @@
             fp.write(s)
 
     if stat:
-        diffopts.context = 0
+        diffopts = diffopts.copy(context=0)
         width = 80
         if not ui.plain():
             width = util.termwidth()
@@ -803,10 +803,17 @@
             matchfn = self.patch
         if matchfn:
             stat = self.diffopts.get('stat')
+            diff = self.diffopts.get('patch')
             diffopts = patch.diffopts(self.ui, self.diffopts)
             prev = self.repo.changelog.parents(node)[0]
-            diffordiffstat(self.ui, self.repo, diffopts, prev, node,
-                           match=matchfn, stat=stat)
+            if stat:
+                diffordiffstat(self.ui, self.repo, diffopts, prev, node,
+                               match=matchfn, stat=True)
+            if diff:
+                if stat:
+                    self.ui.write("\n")
+                diffordiffstat(self.ui, self.repo, diffopts, prev, node,
+                               match=matchfn, stat=False)
             self.ui.write("\n")
 
     def _meaningful_parentrevs(self, log, rev):
diff -Nru mercurial-1.6.2/mercurial/commands.py mercurial-1.6.4/mercurial/commands.py
--- mercurial-1.6.2/mercurial/commands.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/commands.py	2010-10-01 15:18:50.000000000 +0000
@@ -739,8 +739,10 @@
     If you are committing the result of a merge, do not provide any
     filenames or -I/-X filters.
 
-    If no commit message is specified, the configured editor is
-    started to prompt you for a message.
+    If no commit message is specified, Mercurial starts your
+    configured editor where you can enter a message. In case your
+    commit fails, you will find a backup of your message in
+    ``.hg/last-message.txt``.
 
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
@@ -844,7 +846,7 @@
         lookup = r.lookup
     elif len(args) == 2:
         if not repo:
-            raise util.Abort(_("There is no Mercurial repository here "
+            raise util.Abort(_("there is no Mercurial repository here "
                                "(.hg not found)"))
         rev1, rev2 = args
         r = repo.changelog
@@ -887,7 +889,7 @@
      - empty to denote the default parent.
 
     All string valued-elements are either strictly alphanumeric, or must
-    be enclosed in double quotes ("..."), with "\" as escape character.
+    be enclosed in double quotes ("..."), with "\\" as escape character.
 
     Note that the --overwritten-file and --appended-file options imply the
     use of "HGMERGE=internal:local" during DAG buildup.
@@ -1339,7 +1341,8 @@
     if patchproblems:
         if ui.config('ui', 'patch'):
             ui.write(_(" (Current patch tool may be incompatible with patch,"
-                       " or misconfigured. Please check your .hgrc file)\n"))
+                       " or misconfigured. Please check your configuration"
+                       " file)\n"))
         else:
             ui.write(_(" Internal patcher failure, please report this error"
                        " to http://mercurial.selenic.com/bts/\n"))
@@ -1355,10 +1358,12 @@
     if not cmdpath:
         if editor == 'vi':
             ui.write(_(" No commit editor set and can't find vi in PATH\n"))
-            ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
+            ui.write(_(" (specify a commit editor in your configuration"
+                       " file)\n"))
         else:
             ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
-            ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
+            ui.write(_(" (specify a commit editor in your configuration"
+                       " file)\n"))
             problems += 1
 
     # check username
@@ -1367,7 +1372,7 @@
         user = ui.username()
     except util.Abort, e:
         ui.write(" %s\n" % e)
-        ui.write(_(" (specify a username in your .hgrc file)\n"))
+        ui.write(_(" (specify a username in your configuration file)\n"))
         problems += 1
 
     if not problems:
@@ -1564,7 +1569,7 @@
         reflags |= re.I
     try:
         regexp = re.compile(pattern, reflags)
-    except Exception, inst:
+    except re.error, inst:
         ui.warn(_("grep: invalid match pattern: %s\n") % inst)
         return 1
     sep, eol = ':', '\n'
@@ -2103,7 +2108,7 @@
     """
 
     if not repo and not source:
-        raise util.Abort(_("There is no Mercurial repository here "
+        raise util.Abort(_("there is no Mercurial repository here "
                            "(.hg not found)"))
 
     hexfunc = ui.debugflag and hex or short
@@ -2528,7 +2533,11 @@
 
         revmatchfn = None
         if opts.get('patch') or opts.get('stat'):
-            revmatchfn = cmdutil.match(repo, fns, default='path')
+            if opts.get('follow') or opts.get('follow_first'):
+                # note: this might be wrong when following through merges
+                revmatchfn = cmdutil.match(repo, fns, default='path')
+            else:
+                revmatchfn = matchfn
 
         displayer.show(ctx, copies=copies, matchfn=revmatchfn)
 
@@ -2725,8 +2734,8 @@
     Show definition of symbolic path name NAME. If no name is given,
     show definition of all available names.
 
-    Path names are defined in the [paths] section of
-    ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a
+    Path names are defined in the [paths] section of your
+    configuration file and in ``/etc/mercurial/hgrc``. If run inside a
     repository, ``.hg/hgrc`` is used, too.
 
     The path names ``default`` and ``default-push`` have a special
@@ -2796,7 +2805,7 @@
         try:
             revs = [other.lookup(rev) for rev in revs]
         except error.CapabilityError:
-            err = _("Other repository doesn't support revision lookup, "
+            err = _("other repository doesn't support revision lookup, "
                     "so a rev cannot be specified.")
             raise util.Abort(err)
 
@@ -2911,21 +2920,24 @@
             ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
             ret = 1
 
-    def warn(files, reason):
-        for f in files:
-            ui.warn(_('not removing %s: file %s (use -f to force removal)\n')
-                    % (m.rel(f), reason))
-            ret = 1
-
     if force:
         remove, forget = modified + deleted + clean, added
     elif after:
         remove, forget = deleted, []
-        warn(modified + added + clean, _('still exists'))
+        for f in modified + added + clean:
+            ui.warn(_('not removing %s: file still exists (use -f'
+                      ' to force removal)\n') % m.rel(f))
+            ret = 1
     else:
         remove, forget = deleted + clean, []
-        warn(modified, _('is modified'))
-        warn(added, _('has been marked for add'))
+        for f in modified:
+            ui.warn(_('not removing %s: file is modified (use -f'
+                      ' to force removal)\n') % m.rel(f))
+            ret = 1
+        for f in added:
+            ui.warn(_('not removing %s: file has been marked for add (use -f'
+                      ' to force removal)\n') % m.rel(f))
+            ret = 1
 
     for f in sorted(remove + forget):
         if ui.verbose or not m.exact(f):
@@ -2958,31 +2970,35 @@
         wlock.release()
 
 def resolve(ui, repo, *pats, **opts):
-    """various operations to help finish a merge
+    """redo merges or set/view the merge status of files
 
-    This command includes several actions that are often useful while
-    performing a merge, after running ``merge`` but before running
-    ``commit``.  (It is only meaningful if your working directory has
-    two parents.)  It is most relevant for merges with unresolved
-    conflicts, which are typically a result of non-interactive merging with
-    ``internal:merge`` or a command-line merge tool like ``diff3``.
-
-    The available actions are:
-
-      1) list files that were merged with conflicts (U, for unresolved)
-         and without conflicts (R, for resolved): ``hg resolve -l``
-         (this is like ``status`` for merges)
-      2) record that you have resolved conflicts in certain files:
-         ``hg resolve -m [file ...]`` (default: mark all unresolved files)
-      3) forget that you have resolved conflicts in certain files:
-         ``hg resolve -u [file ...]`` (default: unmark all resolved files)
-      4) discard your current attempt(s) at resolving conflicts and
-         restart the merge from scratch: ``hg resolve file...``
-         (or ``-a`` for all unresolved files)
-
-    Note that Mercurial will not let you commit files with unresolved merge
-    conflicts.  You must use ``hg resolve -m ...`` before you can commit
-    after a conflicting merge.
+    Merges with unresolved conflicts are often the result of
+    non-interactive merging using the ``internal:merge`` configuration
+    setting, or a command-line merge tool like ``diff3``. The resolve
+    command is used to manage the files involved in a merge, after
+    :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
+    working directory must have two parents).
+
+    The resolve command can be used in the following ways:
+
+    - :hg:`resolve FILE...`: attempt to re-merge the specified files,
+      discarding any previous merge attempts. Re-merging is not
+      performed for files already marked as resolved. Use ``--all/-a``
+      to selects all unresolved files.
+
+    - :hg:`resolve -m [FILE]`: mark a file as having been resolved
+      (e.g. after having manually fixed-up the files). The default is
+      to mark all unresolved files.
+
+    - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
+      default is to mark all resolved files.
+
+    - :hg:`resolve -l`: list files which had or still have conflicts.
+      In the printed list, ``U`` = unresolved and ``R`` = resolved.
+
+    Note that Mercurial will not let you commit files with unresolved
+    merge conflicts. You must use :hg:`resolve -m ...` before you can
+    commit after a conflicting merge.
 
     Returns 0 on success, 1 if any files fail a resolve attempt.
     """
@@ -4187,7 +4203,7 @@
            _('show only heads which are descendants of REV'), _('REV')),
           ('t', 'topo', False, _('show topological heads only')),
           ('a', 'active', False,
-           _('show active branchheads only [DEPRECATED]')),
+           _('show active branchheads only (DEPRECATED)')),
           ('c', 'closed', False,
            _('show normal and closed branch heads')),
          ] + templateopts,
@@ -4350,7 +4366,7 @@
          [('a', 'all', None, _('select all unresolved files')),
           ('l', 'list', None, _('list state of files needing merge')),
           ('m', 'mark', None, _('mark files as resolved')),
-          ('u', 'unmark', None, _('unmark files as resolved')),
+          ('u', 'unmark', None, _('mark files as unresolved')),
           ('n', 'no-status', None, _('hide status prefix'))]
           + walkopts,
           _('[OPTION]... [FILE]...')),
diff -Nru mercurial-1.6.2/mercurial/context.py mercurial-1.6.4/mercurial/context.py
--- mercurial-1.6.2/mercurial/context.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/context.py	2010-10-01 15:18:50.000000000 +0000
@@ -198,7 +198,7 @@
             if match(fn):
                 yield fn
         for fn in sorted(fset):
-            if match.bad(fn, 'No such file in rev ' + str(self)) and match(fn):
+            if match.bad(fn, _('no such file in rev %s') % self) and match(fn):
                 yield fn
 
     def sub(self, path):
@@ -824,7 +824,7 @@
         wlock = self._repo.wlock()
         try:
             for f in list:
-                if unlink and os.path.exists(self._repo.wjoin(f)):
+                if unlink and os.path.lexists(self._repo.wjoin(f)):
                     self._repo.ui.warn(_("%s still exists!\n") % f)
                 elif self._repo.dirstate[f] == 'a':
                     self._repo.dirstate.forget(f)
@@ -843,7 +843,7 @@
                 if self._repo.dirstate[f] != 'r':
                     self._repo.ui.warn(_("%s not removed!\n") % f)
                 else:
-                    fctx = f in pctxs[0] and pctxs[0] or pctxs[1]
+                    fctx = f in pctxs[0] and pctxs[0][f] or pctxs[1][f]
                     t = fctx.data()
                     self._repo.wwrite(f, t, fctx.flags())
                     self._repo.dirstate.normal(f)
@@ -852,7 +852,7 @@
 
     def copy(self, source, dest):
         p = self._repo.wjoin(dest)
-        if not (os.path.exists(p) or os.path.islink(p)):
+        if not os.path.lexists(p):
             self._repo.ui.warn(_("%s does not exist!\n") % dest)
         elif not (os.path.isfile(p) or os.path.islink(p)):
             self._repo.ui.warn(_("copy failed: %s is not a file or a "
diff -Nru mercurial-1.6.2/mercurial/dagparser.py mercurial-1.6.4/mercurial/dagparser.py
--- mercurial-1.6.2/mercurial/dagparser.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/dagparser.py	2010-10-01 15:18:50.000000000 +0000
@@ -7,6 +7,7 @@
 
 import re, string
 import util
+from i18n import _
 
 def parsedag(desc):
     '''parses a DAG from a concise textual description; generates events
@@ -267,7 +268,7 @@
                 s += c
                 i += 1
                 c = nextch()
-            raise util.Abort("invalid character in dag description: %s..." % s)
+            raise util.Abort(_("invalid character in dag description: %s...") % s)
 
 def dagtextlines(events,
                  addspaces=True,
@@ -295,14 +296,14 @@
 
                 # sanity check
                 if r != wantr:
-                    raise util.Abort("Expected id %i, got %i" % (wantr, r))
+                    raise util.Abort(_("expected id %i, got %i") % (wantr, r))
                 if not ps:
                     ps = [-1]
                 else:
                     for p in ps:
                         if p >= r:
-                            raise util.Abort("Parent id %i is larger than "
-                                             "current id %i" % (p, r))
+                            raise util.Abort(_("parent id %i is larger than "
+                                               "current id %i") % (p, r))
                 wantr += 1
 
                 # new root?
diff -Nru mercurial-1.6.2/mercurial/dirstate.py mercurial-1.6.4/mercurial/dirstate.py
--- mercurial-1.6.2/mercurial/dirstate.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/dirstate.py	2010-10-01 15:18:50.000000000 +0000
@@ -362,7 +362,7 @@
         norm_path = os.path.normcase(path)
         fold_path = self._foldmap.get(norm_path, None)
         if fold_path is None:
-            if knownpath or not os.path.exists(os.path.join(self._root, path)):
+            if knownpath or not os.path.lexists(os.path.join(self._root, path)):
                 fold_path = path
             else:
                 fold_path = self._foldmap.setdefault(norm_path,
@@ -625,6 +625,8 @@
         dadd = deleted.append
         cadd = clean.append
 
+        lnkkind = stat.S_IFLNK
+
         for fn, st in self.walk(match, subrepos, listunknown,
                                 listignored).iteritems():
             if fn not in dmap:
@@ -640,13 +642,19 @@
             if not st and state in "nma":
                 dadd(fn)
             elif state == 'n':
+                # The "mode & lnkkind != lnkkind or self._checklink"
+                # lines are an expansion of "islink => checklink"
+                # where islink means "is this a link?" and checklink
+                # means "can we check links?".
                 if (size >= 0 and
                     (size != st.st_size
                      or ((mode ^ st.st_mode) & 0100 and self._checkexec))
+                    and (mode & lnkkind != lnkkind or self._checklink)
                     or size == -2 # other parent
                     or fn in self._copymap):
                     madd(fn)
-                elif time != int(st.st_mtime):
+                elif (time != int(st.st_mtime)
+                      and (mode & lnkkind != lnkkind or self._checklink)):
                     ladd(fn)
                 elif listclean:
                     cadd(fn)
diff -Nru mercurial-1.6.2/mercurial/dispatch.py mercurial-1.6.4/mercurial/dispatch.py
--- mercurial-1.6.2/mercurial/dispatch.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/dispatch.py	2010-10-01 15:18:50.000000000 +0000
@@ -182,7 +182,7 @@
 
 class cmdalias(object):
     def __init__(self, name, definition, cmdtable):
-        self.name = name
+        self.name = self.cmd = name
         self.definition = definition
         self.args = []
         self.opts = []
@@ -191,7 +191,11 @@
         self.badalias = False
 
         try:
-            cmdutil.findcmd(self.name, cmdtable, True)
+            aliases, entry = cmdutil.findcmd(self.name, cmdtable)
+            for alias, e in cmdtable.iteritems():
+                if e is entry:
+                    self.cmd = alias
+                    break
             self.shadows = True
         except error.UnknownCommand:
             self.shadows = False
@@ -256,7 +260,7 @@
     # but only if they have been defined prior to the current definition.
     for alias, definition in ui.configitems('alias'):
         aliasdef = cmdalias(alias, definition, cmdtable)
-        cmdtable[alias] = (aliasdef, aliasdef.opts, aliasdef.help)
+        cmdtable[aliasdef.cmd] = (aliasdef, aliasdef.opts, aliasdef.help)
         if aliasdef.norepo:
             commands.norepo += ' %s' % alias
 
@@ -420,9 +424,9 @@
     cmd, func, args, options, cmdoptions = _parse(lui, args)
 
     if options["config"]:
-        raise util.Abort(_("Option --config may not be abbreviated!"))
+        raise util.Abort(_("option --config may not be abbreviated!"))
     if options["cwd"]:
-        raise util.Abort(_("Option --cwd may not be abbreviated!"))
+        raise util.Abort(_("option --cwd may not be abbreviated!"))
     if options["repository"]:
         raise util.Abort(_(
             "Option -R has to be separated from other options (e.g. not -qR) "
diff -Nru mercurial-1.6.2/mercurial/encoding.py mercurial-1.6.4/mercurial/encoding.py
--- mercurial-1.6.2/mercurial/encoding.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/encoding.py	2010-10-01 15:18:50.000000000 +0000
@@ -8,21 +8,41 @@
 import error
 import sys, unicodedata, locale, os
 
-_encodingfixup = {'646': 'ascii', 'ANSI_X3.4-1968': 'ascii'}
+def _getpreferredencoding():
+    '''
+    On darwin, getpreferredencoding ignores the locale environment and
+    always returns mac-roman. http://bugs.python.org/issue6202 fixes this
+    for Python 2.7 and up. This is the same corrected code for earlier
+    Python versions.
+
+    However, we can't use a version check for this method, as some distributions 
+    patch Python to fix this. Instead, we use it as a 'fixer' for the mac-roman
+    encoding, as it is unlikely that this encoding is the actually expected.
+    '''
+    try:
+        locale.CODESET
+    except AttributeError:
+        # Fall back to parsing environment variables :-(
+        return locale.getdefaultlocale()[1]
+
+    oldloc = locale.setlocale(locale.LC_CTYPE)
+    locale.setlocale(locale.LC_CTYPE, "")
+    result = locale.nl_langinfo(locale.CODESET)
+    locale.setlocale(locale.LC_CTYPE, oldloc)
+
+    return result
+
+_encodingfixers = {
+    '646': lambda: 'ascii',
+    'ANSI_X3.4-1968': lambda: 'ascii',
+    'mac-roman': _getpreferredencoding
+}
 
 try:
     encoding = os.environ.get("HGENCODING")
-    if sys.platform == 'darwin' and not encoding:
-        # On darwin, getpreferredencoding ignores the locale environment and
-        # always returns mac-roman. We override this if the environment is
-        # not C (has been customized by the user).
-        lc = locale.setlocale(locale.LC_CTYPE, '')
-        if lc == 'UTF-8':
-            locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8')
-        encoding = locale.getlocale()[1]
     if not encoding:
         encoding = locale.getpreferredencoding() or 'ascii'
-        encoding = _encodingfixup.get(encoding, encoding)
+        encoding = _encodingfixers.get(encoding, lambda: encoding)()
 except locale.Error:
     encoding = 'ascii'
 encodingmode = os.environ.get("HGENCODINGMODE", "strict")
diff -Nru mercurial-1.6.2/mercurial/filemerge.py mercurial-1.6.4/mercurial/filemerge.py
--- mercurial-1.6.2/mercurial/filemerge.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/filemerge.py	2010-10-01 15:18:50.000000000 +0000
@@ -138,9 +138,6 @@
     if not fco.cmp(fcd.data()): # files identical?
         return None
 
-    if fca == fco: # backwards, use working dir parent as ancestor
-        fca = fcd.parents()[0]
-
     ui = repo.ui
     fd = fcd.path()
     binary = isbin(fcd) or isbin(fco) or isbin(fca)
@@ -228,7 +225,8 @@
 
     if not r and (_toolbool(ui, tool, "checkconflicts") or
                   'conflicts' in _toollist(ui, tool, "check")):
-        if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data()):
+        if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(),
+                     re.MULTILINE):
             r = 1
 
     checked = False
diff -Nru mercurial-1.6.2/mercurial/hbisect.py mercurial-1.6.4/mercurial/hbisect.py
--- mercurial-1.6.2/mercurial/hbisect.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/hbisect.py	2010-10-01 15:18:50.000000000 +0000
@@ -61,7 +61,9 @@
         badrev, ancestors = buildancestors(state['good'], state['bad'])
     bad = changelog.node(badrev)
     if not ancestors: # now we're confused
-        raise util.Abort(_("Inconsistent state, %s:%s is good and bad")
+        if len(state['bad']) == 1 and len(state['good']) == 1:
+            raise util.Abort(_("starting revisions are not directly related"))
+        raise util.Abort(_("inconsistent state, %s:%s is good and bad")
                          % (badrev, short(bad)))
 
     # build children dict
diff -Nru mercurial-1.6.2/mercurial/help/diffs.txt mercurial-1.6.4/mercurial/help/diffs.txt
--- mercurial-1.6.2/mercurial/help/diffs.txt	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/help/diffs.txt	2010-10-01 15:18:50.000000000 +0000
@@ -25,5 +25,5 @@
 
 To make Mercurial produce the git extended diff format, use the --git
 option available for many commands, or set 'git = True' in the [diff]
-section of your hgrc. You do not need to set this option when
-importing diffs in this format or using them in the mq extension.
+section of your configuration file. You do not need to set this option
+when importing diffs in this format or using them in the mq extension.
diff -Nru mercurial-1.6.2/mercurial/help/environment.txt mercurial-1.6.4/mercurial/help/environment.txt
--- mercurial-1.6.2/mercurial/help/environment.txt	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/help/environment.txt	2010-10-01 15:18:50.000000000 +0000
@@ -8,7 +8,7 @@
 HGEDITOR
     This is the name of the editor to run when committing. See EDITOR.
 
-    (deprecated, use .hgrc)
+    (deprecated, use configuration file)
 
 HGENCODING
     This overrides the default locale setting detected by Mercurial.
@@ -29,13 +29,13 @@
     will be executed with three arguments: local file, remote file,
     ancestor file.
 
-    (deprecated, use .hgrc)
+    (deprecated, use configuration file)
 
 HGRCPATH
-    A list of files or directories to search for hgrc files. Item
-    separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set,
-    platform default search path is used. If empty, only the .hg/hgrc
-    from the current repository is read.
+    A list of files or directories to search for configuration
+    files. Item separator is ":" on Unix, ";" on Windows. If HGRCPATH
+    is not set, platform default search path is used. If empty, only
+    the .hg/hgrc from the current repository is read.
 
     For each element in HGRCPATH:
 
@@ -43,9 +43,9 @@
     - otherwise, the file itself will be added
 
 HGPLAIN
-    When set, this disables any options in .hgrc that might change
-    Mercurial's default output. This includes encoding, defaults,
-    verbose mode, debug mode, quiet mode, tracebacks, and
+    When set, this disables any configuration settings that might
+    change Mercurial's default output. This includes encoding,
+    defaults, verbose mode, debug mode, quiet mode, tracebacks, and
     localization. This can be useful when scripting against Mercurial
     in the face of existing user configuration.
 
@@ -57,12 +57,12 @@
     available values will be considered in this order:
 
     - HGUSER (deprecated)
-    - hgrc files from the HGRCPATH
+    - configuration files from the HGRCPATH
     - EMAIL
     - interactive prompt
     - LOGNAME (with ``@hostname`` appended)
 
-    (deprecated, use .hgrc)
+    (deprecated, use configuration file)
 
 EMAIL
     May be used as the author of a commit; see HGUSER.
diff -Nru mercurial-1.6.2/mercurial/help/extensions.txt mercurial-1.6.4/mercurial/help/extensions.txt
--- mercurial-1.6.2/mercurial/help/extensions.txt	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/help/extensions.txt	2010-10-01 15:18:50.000000000 +0000
@@ -11,9 +11,9 @@
 Mercurial. It is thus up to the user to activate extensions as
 needed.
 
-To enable the "foo" extension, either shipped with Mercurial or in
-the Python search path, create an entry for it in your hgrc, like
-this::
+To enable the "foo" extension, either shipped with Mercurial or in the
+Python search path, create an entry for it in your configuration file,
+like this::
 
   [extensions]
   foo =
@@ -23,8 +23,8 @@
   [extensions]
   myfeature = ~/.hgext/myfeature.py
 
-To explicitly disable an extension enabled in an hgrc of broader
-scope, prepend its path with !::
+To explicitly disable an extension enabled in a configuration file of
+broader scope, prepend its path with !::
 
   [extensions]
   # disabling extension bar residing in /path/to/extension/bar.py
diff -Nru mercurial-1.6.2/mercurial/help/glossary.txt mercurial-1.6.4/mercurial/help/glossary.txt
--- mercurial-1.6.2/mercurial/help/glossary.txt	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/help/glossary.txt	2010-10-01 15:18:50.000000000 +0000
@@ -42,6 +42,17 @@
 Branch head
     See 'Head, branch'.
 
+Branch, inactive
+    If a named branch has no topological heads, it is considered to be
+    inactive. As an example, a feature branch becomes inactive when it
+    is merged into the default branch. The :hg:`branches` command
+    shows inactive branches by default, though they can be hidden with
+    :hg:`branches --active`.
+
+    NOTE: this concept is deprecated because it is too implicit.
+    Branches should now be explicitly closed using :hg:`commit
+    --close-branch` when they are no longer needed.
+
 Branch, named
     A collection of changesets which have the same branch name. By
     default, children of a changeset in a named branch belong to the
diff -Nru mercurial-1.6.2/mercurial/help/templates.txt mercurial-1.6.4/mercurial/help/templates.txt
--- mercurial-1.6.2/mercurial/help/templates.txt	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/help/templates.txt	2010-10-01 15:18:50.000000000 +0000
@@ -140,6 +140,9 @@
 
 :shortdate: Date. Returns a date like "2006-09-18".
 
+:stringify: Any type. Turns the value into text by converting values into
+    text and concatenating them.
+
 :strip: Any text. Strips all leading and trailing whitespace.
 
 :tabindent: Any text. Returns the text, with every line except the
diff -Nru mercurial-1.6.2/mercurial/help/urls.txt mercurial-1.6.4/mercurial/help/urls.txt
--- mercurial-1.6.2/mercurial/help/urls.txt	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/help/urls.txt	2010-10-01 15:18:50.000000000 +0000
@@ -18,6 +18,9 @@
 possible if the feature is explicitly enabled on the remote Mercurial
 server.
 
+Note that the security of HTTPS URLs depends on proper configuration of
+web.cacerts.
+
 Some notes about using SSH with Mercurial:
 
 - SSH requires an accessible shell account on the destination machine
@@ -35,11 +38,11 @@
     Host *
       Compression yes
 
-  Alternatively specify "ssh -C" as your ssh command in your hgrc or
-  with the --ssh command line option.
+  Alternatively specify "ssh -C" as your ssh command in your
+  configuration file or with the --ssh command line option.
 
-These URLs can all be stored in your hgrc with path aliases under the
-[paths] section like so::
+These URLs can all be stored in your configuration file with path
+aliases under the [paths] section like so::
 
   [paths]
   alias1 = URL1
diff -Nru mercurial-1.6.2/mercurial/help.py mercurial-1.6.4/mercurial/help.py
--- mercurial-1.6.2/mercurial/help.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/help.py	2010-10-01 15:18:50.000000000 +0000
@@ -83,7 +83,7 @@
     return loader
 
 helptable = [
-    (["config"], _("Configuration Files"), loaddoc('config')),
+    (["config", "hgrc"], _("Configuration Files"), loaddoc('config')),
     (["dates"], _("Date Formats"), loaddoc('dates')),
     (["patterns"], _("File Name Patterns"), loaddoc('patterns')),
     (['environment', 'env'], _('Environment Variables'),
diff -Nru mercurial-1.6.2/mercurial/hg.py mercurial-1.6.4/mercurial/hg.py
--- mercurial-1.6.2/mercurial/hg.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/hg.py	2010-10-01 15:18:50.000000000 +0000
@@ -221,7 +221,7 @@
         src_repo = repository(ui, source)
     else:
         src_repo = source
-        branch = (None, [])
+        branch = (None, branch or [])
         origsource = source = src_repo.url()
     rev, checkout = addbranchrevs(src_repo, src_repo, branch, rev)
 
diff -Nru mercurial-1.6.2/mercurial/hgweb/hgwebdir_mod.py mercurial-1.6.4/mercurial/hgweb/hgwebdir_mod.py
--- mercurial-1.6.2/mercurial/hgweb/hgwebdir_mod.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/hgweb/hgwebdir_mod.py	2010-10-01 15:18:50.000000000 +0000
@@ -233,6 +233,10 @@
                 # update time with local timezone
                 try:
                     r = hg.repository(self.ui, path)
+                except error.RepoError:
+                    u.warn(_('error accessing repository at %s\n') % path)
+                    continue
+                try:
                     d = (get_mtime(r.spath), util.makedate()[1])
                 except OSError:
                     continue
diff -Nru mercurial-1.6.2/mercurial/hgweb/hgweb_mod.py mercurial-1.6.4/mercurial/hgweb/hgweb_mod.py
--- mercurial-1.6.2/mercurial/hgweb/hgweb_mod.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/hgweb/hgweb_mod.py	2010-10-01 15:18:50.000000000 +0000
@@ -281,8 +281,8 @@
                 yield {"type" : i, "extension" : spec[2], "node" : nodeid}
 
     archive_specs = {
-        'bz2': ('application/x-tar', 'tbz2', '.tar.bz2', None),
-        'gz': ('application/x-tar', 'tgz', '.tar.gz', None),
+        'bz2': ('application/x-bzip2', 'tbz2', '.tar.bz2', None),
+        'gz': ('application/x-gzip', 'tgz', '.tar.gz', None),
         'zip': ('application/zip', 'zip', '.zip', None),
         }
 
diff -Nru mercurial-1.6.2/mercurial/httprepo.py mercurial-1.6.4/mercurial/httprepo.py
--- mercurial-1.6.2/mercurial/httprepo.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/httprepo.py	2010-10-01 15:18:50.000000000 +0000
@@ -17,7 +17,9 @@
     zd = zlib.decompressobj()
     try:
         for chunk in util.filechunkiter(f):
-            yield zd.decompress(chunk)
+            while chunk:
+                yield zd.decompress(chunk, 2**18)
+                chunk = zd.unconsumed_tail
     except httplib.HTTPException:
         raise IOError(None, _('connection ended unexpectedly'))
     yield zd.flush()
diff -Nru mercurial-1.6.2/mercurial/localrepo.py mercurial-1.6.4/mercurial/localrepo.py
--- mercurial-1.6.2/mercurial/localrepo.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/localrepo.py	2010-10-01 15:18:50.000000000 +0000
@@ -1199,7 +1199,7 @@
                 cg = remote.changegroup(fetch, 'pull')
             else:
                 if not remote.capable('changegroupsubset'):
-                    raise util.Abort(_("Partial pull cannot be done because "
+                    raise util.Abort(_("partial pull cannot be done because "
                                        "other repository doesn't support "
                                        "changegroupsubset."))
                 cg = remote.changegroupsubset(fetch, heads, 'pull')
diff -Nru mercurial-1.6.2/mercurial/mail.py mercurial-1.6.4/mercurial/mail.py
--- mercurial-1.6.2/mercurial/mail.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/mail.py	2010-10-01 15:18:50.000000000 +0000
@@ -36,7 +36,7 @@
     s = smtplib.SMTP(local_hostname=local_hostname)
     mailhost = ui.config('smtp', 'host')
     if not mailhost:
-        raise util.Abort(_('no [smtp]host in hgrc - cannot send mail'))
+        raise util.Abort(_('smtp.host not configured - cannot send mail'))
     mailport = int(ui.config('smtp', 'port', 25))
     ui.note(_('sending mail: smtp host %s, port %s\n') %
             (mailhost, mailport))
diff -Nru mercurial-1.6.2/mercurial/match.py mercurial-1.6.4/mercurial/match.py
--- mercurial-1.6.2/mercurial/match.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/match.py	2010-10-01 15:18:50.000000000 +0000
@@ -7,6 +7,7 @@
 
 import re
 import util
+from i18n import _
 
 class match(object):
     def __init__(self, root, cwd, patterns, include=[], exclude=[],
@@ -214,8 +215,8 @@
             try:
                 re.compile('(?:%s)' % _regex(k, p, tail))
             except re.error:
-                raise util.Abort("invalid pattern (%s): %s" % (k, p))
-        raise util.Abort("invalid pattern")
+                raise util.Abort(_("invalid pattern (%s): %s") % (k, p))
+        raise util.Abort(_("invalid pattern"))
 
 def _normalize(names, default, root, cwd):
     pats = []
diff -Nru mercurial-1.6.2/mercurial/merge.py mercurial-1.6.4/mercurial/merge.py
--- mercurial-1.6.2/mercurial/merge.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/merge.py	2010-10-01 15:18:50.000000000 +0000
@@ -270,7 +270,12 @@
             repo.ui.debug("preserving %s for resolve of %s\n" % (f, fd))
             fcl = wctx[f]
             fco = mctx[f2]
-            fca = fcl.ancestor(fco, actx) or repo.filectx(f, fileid=nullrev)
+            if mctx == actx: # backwards, use working dir parent as ancestor
+                fca = fcl.parents()[0]
+            else:
+                fca = fcl.ancestor(fco, actx)
+            if not fca:
+                fca = repo.filectx(f, fileid=nullrev)
             ms.add(fcl, fco, fca, fd, flags)
             if f != fd and move:
                 moves.append(f)
@@ -323,6 +328,7 @@
             repo.ui.note(_("getting %s\n") % f)
             t = mctx.filectx(f).data()
             repo.wwrite(f, t, flags)
+            t = None
             updated += 1
             if f == '.hgsubstate': # subrepo states need updating
                 subrepo.submerge(repo, wctx, mctx, wctx)
diff -Nru mercurial-1.6.2/mercurial/patch.py mercurial-1.6.4/mercurial/patch.py
--- mercurial-1.6.2/mercurial/patch.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/patch.py	2010-10-01 15:18:50.000000000 +0000
@@ -25,7 +25,7 @@
 
 def copyfile(src, dst, basedir):
     abssrc, absdst = [util.canonpath(basedir, basedir, x) for x in [src, dst]]
-    if os.path.exists(absdst):
+    if os.path.lexists(absdst):
         raise util.Abort(_("cannot create %s: destination already exists") %
                          dst)
 
@@ -923,7 +923,7 @@
     if afile == bfile:
         goodb = gooda
     else:
-        goodb = not nullb and os.path.exists(bfile)
+        goodb = not nullb and os.path.lexists(bfile)
     createfunc = hunk.createfile
     missing = not goodb and not gooda and not createfunc()
 
@@ -1184,7 +1184,9 @@
                 gp.path = pathstrip(gp.path, strip - 1)[1]
                 if gp.oldpath:
                     gp.oldpath = pathstrip(gp.oldpath, strip - 1)[1]
-                if gp.op in ('COPY', 'RENAME'):
+                # Binary patches really overwrite target files, copying them
+                # will just make it fails with "target file exists"
+                if gp.op in ('COPY', 'RENAME') and not gp.binary:
                     copyfn(gp.oldpath, gp.path, cwd)
                 changed[gp.path] = gp
         else:
@@ -1230,7 +1232,7 @@
             islink, isexec = gp.mode
             dst = repo.wjoin(gp.path)
             # patch won't create empty files
-            if gp.op == 'ADD' and not os.path.exists(dst):
+            if gp.op == 'ADD' and not os.path.lexists(dst):
                 flags = (isexec and 'x' or '') + (islink and 'l' or '')
                 repo.wwrite(gp.path, '', flags)
             util.set_flags(dst, islink, isexec)
@@ -1284,7 +1286,7 @@
     if eolmode is None:
         eolmode = ui.config('patch', 'eol', 'strict')
     if eolmode.lower() not in eolmodes:
-        raise util.Abort(_('Unsupported line endings type: %s') % eolmode)
+        raise util.Abort(_('unsupported line endings type: %s') % eolmode)
     eolmode = eolmode.lower()
 
     try:
@@ -1567,6 +1569,9 @@
                         header.append('new file mode %s\n' % mode)
                     elif ctx2.flags(f):
                         losedatafn(f)
+                # In theory, if tn was copied or renamed we should check
+                # if the source is binary too but the copy record already
+                # forces git mode.
                 if util.binary(tn):
                     if opts.git:
                         dodiff = 'binary'
@@ -1586,7 +1591,7 @@
                     else:
                         header.append('deleted file mode %s\n' %
                                       gitmode[man1.flags(f)])
-                elif not to:
+                elif not to or util.binary(to):
                     # regular diffs cannot represent empty file deletion
                     losedatafn(f)
             else:
diff -Nru mercurial-1.6.2/mercurial/revlog.py mercurial-1.6.4/mercurial/revlog.py
--- mercurial-1.6.2/mercurial/revlog.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/revlog.py	2010-10-01 15:18:50.000000000 +0000
@@ -1029,6 +1029,9 @@
             base = self._cache[1]
             text = self._cache[2]
 
+        # drop cache to save memory
+        self._cache = None
+
         self._loadindex(base, rev + 1)
         self._chunkraw(base, rev)
         if text is None:
diff -Nru mercurial-1.6.2/mercurial/revset.py mercurial-1.6.4/mercurial/revset.py
--- mercurial-1.6.2/mercurial/revset.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/revset.py	2010-10-01 15:18:50.000000000 +0000
@@ -268,7 +268,10 @@
     return l
 
 def grep(repo, subset, x):
-    gr = re.compile(getstring(x, _("grep wants a string")))
+    try:
+        gr = re.compile(getstring(x, _("grep wants a string")))
+    except re.error, e:
+        raise error.ParseError(_('invalid match pattern: %s') % e)
     l = []
     for r in subset:
         c = repo[r]
@@ -429,7 +432,7 @@
 def outgoing(repo, subset, x):
     import hg # avoid start-up nasties
     l = getargs(x, 0, 1, _("outgoing wants a repository path"))
-    dest = l[1:] or ''
+    dest = l and getstring(l[0], _("outgoing wants a repository path")) or ''
     dest = repo.ui.expandpath(dest or 'default-push', dest or 'default')
     dest, branches = hg.parseurl(dest)
     other = hg.repository(hg.remoteui(repo, {}), dest)
diff -Nru mercurial-1.6.2/mercurial/simplemerge.py mercurial-1.6.4/mercurial/simplemerge.py
--- mercurial-1.6.2/mercurial/simplemerge.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/simplemerge.py	2010-10-01 15:18:50.000000000 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (C) 2004, 2005 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
diff -Nru mercurial-1.6.2/mercurial/templatefilters.py mercurial-1.6.4/mercurial/templatefilters.py
--- mercurial-1.6.2/mercurial/templatefilters.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/templatefilters.py	2010-10-01 15:18:50.000000000 +0000
@@ -140,6 +140,12 @@
             .replace("'", ''')) # ' invalid in HTML
     return re.sub('[\x00-\x08\x0B\x0C\x0E-\x1F]', ' ', text)
 
+def uescape(c):
+    if ord(c) < 0x80:
+        return c
+    else:
+        return '\\u%04x' % ord(c)
+
 _escapes = [
     ('\\', '\\\\'), ('"', '\\"'), ('\t', '\\t'), ('\n', '\\n'),
     ('\r', '\\r'), ('\f', '\\f'), ('\b', '\\b'),
@@ -148,7 +154,7 @@
 def jsonescape(s):
     for k, v in _escapes:
         s = s.replace(k, v)
-    return s
+    return ''.join(uescape(c) for c in s)
 
 def json(obj):
     if obj is None or obj is False or obj is True:
@@ -156,9 +162,10 @@
     elif isinstance(obj, int) or isinstance(obj, float):
         return str(obj)
     elif isinstance(obj, str):
-        return '"%s"' % jsonescape(obj)
+        u = unicode(obj, encoding.encoding, 'replace')
+        return '"%s"' % jsonescape(u)
     elif isinstance(obj, unicode):
-        return json(obj.encode('utf-8'))
+        return '"%s"' % jsonescape(obj)
     elif hasattr(obj, 'keys'):
         out = []
         for k, v in obj.iteritems():
diff -Nru mercurial-1.6.2/mercurial/templates/raw/map mercurial-1.6.4/mercurial/templates/raw/map
--- mercurial-1.6.2/mercurial/templates/raw/map	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/templates/raw/map	2010-10-01 15:18:50.000000000 +0000
@@ -9,6 +9,7 @@
 changesetparent = '# Parent  {node}'
 changesetchild = '# Child   {node}'
 filenodelink = ''
+filenolink = ''
 fileline = '{line}'
 diffblock = '{lines}'
 filediff = filediff.tmpl
diff -Nru mercurial-1.6.2/mercurial/templates/static/style-gitweb.css mercurial-1.6.4/mercurial/templates/static/style-gitweb.css
--- mercurial-1.6.2/mercurial/templates/static/style-gitweb.css	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/templates/static/style-gitweb.css	2010-10-01 15:18:50.000000000 +0000
@@ -33,6 +33,7 @@
 tr.dark, .parity1 { background-color:#f6f6f0; }
 tr.dark:hover, .parity1:hover { background-color:#edece6; }
 td { padding:2px 5px; font-size:12px; vertical-align:top; }
+td.closed { background-color: #99f; }
 td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }
 td.indexlinks { white-space: nowrap; }
 td.indexlinks a {
diff -Nru mercurial-1.6.2/mercurial/templates/static/style-monoblue.css mercurial-1.6.4/mercurial/templates/static/style-monoblue.css
--- mercurial-1.6.2/mercurial/templates/static/style-monoblue.css	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/templates/static/style-monoblue.css	2010-10-01 15:18:50.000000000 +0000
@@ -204,6 +204,9 @@
 table tr td.nowrap {
   white-space: nowrap;
 }
+table tr td.closed { 
+  background-color: #99f; 
+}
 /*
 table tr.parity0:hover,
 table tr.parity1:hover {
diff -Nru mercurial-1.6.2/mercurial/ui.py mercurial-1.6.4/mercurial/ui.py
--- mercurial-1.6.2/mercurial/ui.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/ui.py	2010-10-01 15:18:50.000000000 +0000
@@ -121,9 +121,11 @@
         self._trustusers.update(self.configlist('trusted', 'users'))
         self._trustgroups.update(self.configlist('trusted', 'groups'))
 
-    def setconfig(self, section, name, value):
-        for cfg in (self._ocfg, self._tcfg, self._ucfg):
-            cfg.set(section, name, value)
+    def setconfig(self, section, name, value, overlay=True):
+        if overlay:
+            self._ocfg.set(section, name, value)
+        self._tcfg.set(section, name, value)
+        self._ucfg.set(section, name, value)
         self.fixconfig()
 
     def _data(self, untrusted):
diff -Nru mercurial-1.6.2/mercurial/url.py mercurial-1.6.4/mercurial/url.py
--- mercurial-1.6.2/mercurial/url.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/url.py	2010-10-01 15:18:50.000000000 +0000
@@ -7,7 +7,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-import urllib, urllib2, urlparse, httplib, os, re, socket, cStringIO
+import urllib, urllib2, urlparse, httplib, os, re, socket, cStringIO, time
 from i18n import _
 import keepalive, util
 
@@ -156,7 +156,7 @@
                 continue
             group, setting = key.split('.', 1)
             gdict = config.setdefault(group, dict())
-            if setting in ('cert', 'key'):
+            if setting in ('username', 'cert', 'key'):
                 val = util.expandpath(val)
             gdict[setting] = val
 
@@ -469,8 +469,30 @@
         _generic_start_transaction(self, h, req)
         return keepalive.HTTPHandler._start_transaction(self, h, req)
 
-    def __del__(self):
-        self.close_all()
+def _verifycert(cert, hostname):
+    '''Verify that cert (in socket.getpeercert() format) matches hostname and is 
+    valid at this time. CRLs and subjectAltName are not handled.
+    
+    Returns error message if any problems are found and None on success.
+    '''
+    if not cert:
+        return _('no certificate received')
+    notafter = cert.get('notAfter')
+    if notafter and time.time() > ssl.cert_time_to_seconds(notafter):
+        return _('certificate expired %s') % notafter
+    notbefore = cert.get('notBefore')
+    if notbefore and time.time() < ssl.cert_time_to_seconds(notbefore):
+        return _('certificate not valid before %s') % notbefore
+    dnsname = hostname.lower()
+    for s in cert.get('subject', []):
+        key, value = s[0]
+        if key == 'commonName':
+            certname = value.lower()
+            if (certname == dnsname or
+                '.' in dnsname and certname == '*.' + dnsname.split('.', 1)[1]):
+                return None
+            return _('certificate is for %s') % certname
+    return _('no commonName found in certificate')
 
 if has_https:
     class BetterHTTPS(httplib.HTTPSConnection):
@@ -487,7 +509,12 @@
                 self.sock = _ssl_wrap_socket(sock, self.key_file,
                         self.cert_file, cert_reqs=CERT_REQUIRED,
                         ca_certs=cacerts)
-                self.ui.debug(_('server identity verification succeeded\n'))
+                msg = _verifycert(self.sock.getpeercert(), self.host)
+                if msg:
+                    raise util.Abort(_('%s certificate error: %s') %
+                                     (self.host, msg))
+                self.ui.debug('%s certificate successfully verified\n' %
+                              self.host)
             else:
                 httplib.HTTPSConnection.connect(self)
 
@@ -570,6 +597,25 @@
                 return
             raise
 
+class httpbasicauthhandler(urllib2.HTTPBasicAuthHandler):
+    def __init__(self, *args, **kwargs):
+        urllib2.HTTPBasicAuthHandler.__init__(self, *args, **kwargs)
+        self.retried_req = None
+
+    def reset_retry_count(self):
+        # Python 2.6.5 will call this on 401 or 407 errors and thus loop
+        # forever. We disable reset_retry_count completely and reset in
+        # http_error_auth_reqed instead.
+        pass
+
+    def http_error_auth_reqed(self, auth_header, host, req, headers):
+        # Reset the retry counter once for each request.
+        if req is not self.retried_req:
+            self.retried_req = req
+            self.retried = 0
+        return urllib2.HTTPBasicAuthHandler.http_error_auth_reqed(
+                        self, auth_header, host, req, headers)
+
 def getauthinfo(path):
     scheme, netloc, urlpath, query, frag = urlparse.urlsplit(path)
     if not urlpath:
@@ -615,7 +661,7 @@
         ui.debug('http auth: user %s, password %s\n' %
                  (user, passwd and '*' * len(passwd) or 'not set'))
 
-    handlers.extend((urllib2.HTTPBasicAuthHandler(passmgr),
+    handlers.extend((httpbasicauthhandler(passmgr),
                      httpdigestauthhandler(passmgr)))
     handlers.extend([h(ui, passmgr) for h in handlerfuncs])
     opener = urllib2.build_opener(*handlers)
diff -Nru mercurial-1.6.2/mercurial/util.py mercurial-1.6.4/mercurial/util.py
--- mercurial-1.6.2/mercurial/util.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/util.py	2010-10-01 15:18:50.000000000 +0000
@@ -15,7 +15,7 @@
 
 from i18n import _
 import error, osutil, encoding
-import cStringIO, errno, re, shutil, sys, tempfile, traceback
+import errno, re, shutil, sys, tempfile, traceback
 import os, stat, time, calendar, textwrap, unicodedata, signal
 import imp
 
@@ -28,9 +28,9 @@
     # This function will import sha1 from hashlib or sha (whichever is
     # available) and overwrite itself with it on the first call.
     # Subsequent calls will go directly to the imported function.
-    try:
+    if sys.version_info >= (2, 5):
         from hashlib import sha1 as _sha1
-    except ImportError:
+    else:
         from sha import sha as _sha1
     global _fastsha1, sha1
     _fastsha1 = sha1 = _sha1
@@ -642,7 +642,7 @@
             l = l + 1
         name = name[l:]
 
-    if not os.path.exists(os.path.join(root, name)):
+    if not os.path.lexists(os.path.join(root, name)):
         return None
 
     seps = os.sep
@@ -909,31 +909,36 @@
         """in_iter is the iterator that's iterating over the input chunks.
         targetsize is how big a buffer to try to maintain."""
         self.iter = iter(in_iter)
-        self.buf = ''
-        self.targetsize = 2**16
+        self._queue = []
 
     def read(self, l):
         """Read L bytes of data from the iterator of chunks of data.
         Returns less than L bytes if the iterator runs dry."""
-        if l > len(self.buf) and self.iter:
-            # Clamp to a multiple of self.targetsize
-            targetsize = max(l, self.targetsize)
-            collector = cStringIO.StringIO()
-            collector.write(self.buf)
-            collected = len(self.buf)
-            for chunk in self.iter:
-                collector.write(chunk)
-                collected += len(chunk)
-                if collected >= targetsize:
+        left = l
+        buf = ''
+        queue = self._queue
+        while left > 0:
+            # refill the queue
+            if not queue:
+                target = 2**18
+                for chunk in self.iter:
+                    queue.append(chunk)
+                    target -= len(chunk)
+                    if target <= 0:
+                        break
+                if not queue:
                     break
-            if collected < targetsize:
-                self.iter = False
-            self.buf = collector.getvalue()
-        if len(self.buf) == l:
-            s, self.buf = str(self.buf), ''
-        else:
-            s, self.buf = self.buf[:l], buffer(self.buf, l)
-        return s
+
+            chunk = queue.pop(0)
+            left -= len(chunk)
+            if left < 0:
+                queue.insert(0, chunk[left:])
+                buf += chunk[:left]
+            else:
+                buf += chunk
+
+        return buf
+
 
 def filechunkiter(f, size=65536, limit=None):
     """Create a generator that produces the data in the file size
diff -Nru mercurial-1.6.2/mercurial/verify.py mercurial-1.6.4/mercurial/verify.py
--- mercurial-1.6.2/mercurial/verify.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/verify.py	2010-10-01 15:18:50.000000000 +0000
@@ -48,6 +48,8 @@
         if isinstance(inst, KeyboardInterrupt):
             ui.warn(_("interrupted"))
             raise
+        if not str(inst):
+            inst = repr(inst)
         err(linkrev, "%s: %s" % (msg, inst), filename)
 
     def warn(msg):
@@ -197,7 +199,7 @@
     for f, f2, size in repo.store.datafiles():
         if not f:
             err(None, _("cannot decode filename '%s'") % f2)
-        elif size > 0:
+        elif size > 0 or not revlogv1:
             storefiles.add(f)
 
     files = sorted(set(filenodes) | set(filelinkrevs))
@@ -229,6 +231,7 @@
 
         checklog(fl, f, lr)
         seen = {}
+        rp = None
         for i in fl:
             revisions += 1
             n = fl.node(i)
@@ -241,12 +244,12 @@
 
             # verify contents
             try:
-                t = fl.read(n)
+                l = len(fl.read(n))
                 rp = fl.renamed(n)
-                if len(t) != fl.size(i):
+                if l != fl.size(i):
                     if len(fl.revision(n)) != fl.size(i):
                         err(lr, _("unpacked size is %s, %s expected") %
-                            (len(t), fl.size(i)), f)
+                            (l, fl.size(i)), f)
             except Exception, inst:
                 exc(lr, _("unpacking %s") % short(n), inst, f)
 
diff -Nru mercurial-1.6.2/mercurial/__version__.py mercurial-1.6.4/mercurial/__version__.py
--- mercurial-1.6.2/mercurial/__version__.py	2010-08-02 18:30:13.000000000 +0000
+++ mercurial-1.6.4/mercurial/__version__.py	2010-10-01 15:19:06.000000000 +0000
@@ -1,2 +1,2 @@
 # this file is autogenerated by setup.py
-version = "1.6.2"
+version = "1.6.4"
diff -Nru mercurial-1.6.2/mercurial/win32.py mercurial-1.6.4/mercurial/win32.py
--- mercurial-1.6.2/mercurial/win32.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/mercurial/win32.py	2010-10-01 15:18:50.000000000 +0000
@@ -23,15 +23,6 @@
 def os_link(src, dst):
     try:
         win32file.CreateHardLink(dst, src)
-        # CreateHardLink sometimes succeeds on mapped drives but
-        # following nlinks() returns 1. Check it now and bail out.
-        if nlinks(src) < 2:
-            try:
-                win32file.DeleteFile(dst)
-            except:
-                pass
-            # Fake hardlinking error
-            raise OSError(errno.EINVAL, 'Hardlinking not supported')
     except pywintypes.error:
         raise OSError(errno.EINVAL, 'target implements hardlinks improperly')
     except NotImplementedError: # Another fake error win Win98
@@ -43,41 +34,41 @@
         fh = win32file.CreateFile(pathname,
             win32file.GENERIC_READ, win32file.FILE_SHARE_READ,
             None, win32file.OPEN_EXISTING, 0, None)
-        try:
-            return win32file.GetFileInformationByHandle(fh)
-        finally:
-            fh.Close()
     except pywintypes.error:
-        return None
+        raise OSError(errno.ENOENT, 'The system cannot find the file specified')
+    try:
+        return win32file.GetFileInformationByHandle(fh)
+    finally:
+        fh.Close()
 
 def nlinks(pathname):
     """Return number of hardlinks for the given file."""
-    res = _getfileinfo(pathname)
-    if res is not None:
-        return res[7]
-    else:
-        return os.lstat(pathname).st_nlink
+    links = _getfileinfo(pathname)[7]
+    if links < 2:
+        # Known to be wrong for most network drives
+        dirname = os.path.dirname(pathname)
+        if not dirname:
+            dirname = '.'
+        dt = win32file.GetDriveType(dirname + '\\')
+        if dt == 4 or dt == 1:
+            # Fake hardlink to force COW for network drives
+            links = 2
+    return links
 
 def samefile(fpath1, fpath2):
     """Returns whether fpath1 and fpath2 refer to the same file. This is only
     guaranteed to work for files, not directories."""
     res1 = _getfileinfo(fpath1)
     res2 = _getfileinfo(fpath2)
-    if res1 is not None and res2 is not None:
-        # Index 4 is the volume serial number, and 8 and 9 contain the file ID
-        return res1[4] == res2[4] and res1[8] == res2[8] and res1[9] == res2[9]
-    else:
-        return False
+    # Index 4 is the volume serial number, and 8 and 9 contain the file ID
+    return res1[4] == res2[4] and res1[8] == res2[8] and res1[9] == res2[9]
 
 def samedevice(fpath1, fpath2):
     """Returns whether fpath1 and fpath2 are on the same device. This is only
     guaranteed to work for files, not directories."""
     res1 = _getfileinfo(fpath1)
     res2 = _getfileinfo(fpath2)
-    if res1 is not None and res2 is not None:
-        return res1[4] == res2[4]
-    else:
-        return False
+    return res1[4] == res2[4]
 
 def testpid(pid):
     '''return True if pid is still running or unable to
diff -Nru mercurial-1.6.2/PKG-INFO mercurial-1.6.4/PKG-INFO
--- mercurial-1.6.2/PKG-INFO	2010-08-02 18:30:13.000000000 +0000
+++ mercurial-1.6.4/PKG-INFO	2010-10-01 15:19:06.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: mercurial
-Version: 1.6.2
+Version: 1.6.4
 Summary: Scalable distributed SCM
 Home-page: http://mercurial.selenic.com/
 Author: Matt Mackall
diff -Nru mercurial-1.6.2/tests/darcs/darcs1/a mercurial-1.6.4/tests/darcs/darcs1/a
--- mercurial-1.6.2/tests/darcs/darcs1/a	1970-01-01 00:00:00.000000000 +0000
+++ mercurial-1.6.4/tests/darcs/darcs1/a	2010-10-01 15:18:50.000000000 +0000
@@ -0,0 +1 @@
+a 
diff -Nru mercurial-1.6.2/tests/darcs/darcs1/_darcs/inventory mercurial-1.6.4/tests/darcs/darcs1/_darcs/inventory
--- mercurial-1.6.2/tests/darcs/darcs1/_darcs/inventory	1970-01-01 00:00:00.000000000 +0000
+++ mercurial-1.6.4/tests/darcs/darcs1/_darcs/inventory	2010-10-01 15:18:50.000000000 +0000
@@ -0,0 +1,2 @@
+[adda
+test@test.com**20100923184058] 
diff -Nru mercurial-1.6.2/tests/darcs/darcs1/_darcs/prefs/author mercurial-1.6.4/tests/darcs/darcs1/_darcs/prefs/author
--- mercurial-1.6.2/tests/darcs/darcs1/_darcs/prefs/author	1970-01-01 00:00:00.000000000 +0000
+++ mercurial-1.6.4/tests/darcs/darcs1/_darcs/prefs/author	2010-10-01 15:18:50.000000000 +0000
@@ -0,0 +1 @@
+test@test.com
\ No newline at end of file
diff -Nru mercurial-1.6.2/tests/darcs/darcs1/_darcs/prefs/binaries mercurial-1.6.4/tests/darcs/darcs1/_darcs/prefs/binaries
--- mercurial-1.6.2/tests/darcs/darcs1/_darcs/prefs/binaries	1970-01-01 00:00:00.000000000 +0000
+++ mercurial-1.6.4/tests/darcs/darcs1/_darcs/prefs/binaries	2010-10-01 15:18:50.000000000 +0000
@@ -0,0 +1,59 @@
+# Binary file regexps:
+\.png$
+\.PNG$
+\.gz$
+\.GZ$
+\.pdf$
+\.PDF$
+\.jpg$
+\.JPG$
+\.jpeg$
+\.JPEG$
+\.gif$
+\.GIF$
+\.tif$
+\.TIF$
+\.tiff$
+\.TIFF$
+\.pnm$
+\.PNM$
+\.pbm$
+\.PBM$
+\.pgm$
+\.PGM$
+\.ppm$
+\.PPM$
+\.bmp$
+\.BMP$
+\.mng$
+\.MNG$
+\.tar$
+\.TAR$
+\.bz2$
+\.BZ2$
+\.z$
+\.Z$
+\.zip$
+\.ZIP$
+\.jar$
+\.JAR$
+\.so$
+\.SO$
+\.a$
+\.A$
+\.tgz$
+\.TGZ$
+\.mpg$
+\.MPG$
+\.mpeg$
+\.MPEG$
+\.iso$
+\.ISO$
+\.exe$
+\.EXE$
+\.doc$
+\.DOC$
+\.elc$
+\.ELC$
+\.pyc$
+\.PYC$
diff -Nru mercurial-1.6.2/tests/darcs/darcs1/_darcs/prefs/boring mercurial-1.6.4/tests/darcs/darcs1/_darcs/prefs/boring
--- mercurial-1.6.2/tests/darcs/darcs1/_darcs/prefs/boring	1970-01-01 00:00:00.000000000 +0000
+++ mercurial-1.6.4/tests/darcs/darcs1/_darcs/prefs/boring	2010-10-01 15:18:50.000000000 +0000
@@ -0,0 +1,49 @@
+# Boring file regexps:
+\.hi$
+\.hi-boot$
+\.o-boot$
+\.o$
+\.o\.cmd$
+# *.ko files aren't boring by default because they might
+# be Korean translations rather than kernel modules.
+# \.ko$
+\.ko\.cmd$
+\.mod\.c$
+(^|/)\.tmp_versions($|/)
+(^|/)CVS($|/)
+\.cvsignore$
+^\.#
+(^|/)RCS($|/)
+,v$
+(^|/)\.svn($|/)
+\.bzr$
+(^|/)SCCS($|/)
+~$
+(^|/)_darcs($|/)
+\.bak$
+\.BAK$
+\.orig$
+\.rej$
+(^|/)vssver\.scc$
+\.swp$
+(^|/)MT($|/)
+(^|/)\{arch\}($|/)
+(^|/).arch-ids($|/)
+(^|/),
+\.prof$
+(^|/)\.DS_Store$
+(^|/)BitKeeper($|/)
+(^|/)ChangeSet($|/)
+\.py[co]$
+\.elc$
+\.class$
+\#
+(^|/)Thumbs\.db$
+(^|/)autom4te\.cache($|/)
+(^|/)config\.(log|status)$
+^\.depend$
+(^|/)(tags|TAGS)$
+#(^|/)\.[^/]
+(^|/|\.)core$
+\.(obj|a|exe|so|lo|la)$
+^\.darcs-temp-mail$
diff -Nru mercurial-1.6.2/tests/darcs/darcs1/_darcs/pristine/a mercurial-1.6.4/tests/darcs/darcs1/_darcs/pristine/a
--- mercurial-1.6.2/tests/darcs/darcs1/_darcs/pristine/a	1970-01-01 00:00:00.000000000 +0000
+++ mercurial-1.6.4/tests/darcs/darcs1/_darcs/pristine/a	2010-10-01 15:18:50.000000000 +0000
@@ -0,0 +1 @@
+a 
diff -Nru mercurial-1.6.2/tests/revlog-formatv0.py mercurial-1.6.4/tests/revlog-formatv0.py
--- mercurial-1.6.2/tests/revlog-formatv0.py	1970-01-01 00:00:00.000000000 +0000
+++ mercurial-1.6.4/tests/revlog-formatv0.py	2010-10-01 15:18:50.000000000 +0000
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+# Copyright 2010 Intevation GmbH
+# Author(s):
+# Thomas Arendsen Hein 
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
+"""Create a Mercurial repository in revlog format 0
+
+changeset:   0:a1ef0b125355
+tag:         tip
+user:        user
+date:        Thu Jan 01 00:00:00 1970 +0000
+files:       empty
+description:
+empty file
+"""
+
+import os, sys
+
+files = [
+    ('formatv0/.hg/00changelog.i',
+     '000000000000004400000000000000000000000000000000000000'
+     '000000000000000000000000000000000000000000000000000000'
+     '0000a1ef0b125355d27765928be600cfe85784284ab3'),
+    ('formatv0/.hg/00changelog.d',
+     '756163613935613961356635353036303562366138343738336237'
+     '61623536363738616436356635380a757365720a3020300a656d70'
+     '74790a0a656d7074792066696c65'),
+    ('formatv0/.hg/00manifest.i',
+     '000000000000003000000000000000000000000000000000000000'
+     '000000000000000000000000000000000000000000000000000000'
+     '0000aca95a9a5f550605b6a84783b7ab56678ad65f58'),
+    ('formatv0/.hg/00manifest.d',
+     '75656d707479006238306465356431333837353835343163356630'
+     '35323635616431343461623966613836643164620a'),
+    ('formatv0/.hg/data/empty.i',
+     '000000000000000000000000000000000000000000000000000000'
+     '000000000000000000000000000000000000000000000000000000'
+     '0000b80de5d138758541c5f05265ad144ab9fa86d1db'),
+    ('formatv0/.hg/data/empty.d',
+     ''),
+]
+
+def makedirs(name):
+    """recursive directory creation"""
+    parent = os.path.dirname(name)
+    if parent:
+        makedirs(parent)
+    os.mkdir(name)
+
+makedirs(os.path.join(*'formatv0/.hg/data'.split('/')))
+
+for name, data in files:
+    f = open(name, 'wb')
+    f.write(data.decode('hex'))
+    f.close()
+
+sys.exit(0)
diff -Nru mercurial-1.6.2/tests/test-archive mercurial-1.6.4/tests/test-archive
--- mercurial-1.6.2/tests/test-archive	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-archive	2010-10-01 15:18:50.000000000 +0000
@@ -140,4 +140,11 @@
 cd ../empty
 hg archive ../test-empty
 
+echo '% old file -- date clamped to 1980'
+touch -t 197501010000 old
+hg add old
+hg commit -m old
+hg archive ../old.zip
+unzip -l ../old.zip | grep 80 > /dev/null && echo ok
+
 exit 0
diff -Nru mercurial-1.6.2/tests/test-archive.out mercurial-1.6.4/tests/test-archive.out
--- mercurial-1.6.2/tests/test-archive.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-archive.out	2010-10-01 15:18:50.000000000 +0000
@@ -80,3 +80,5 @@
 % server errors
 % empty repo
 abort: no working directory: please specify a revision
+% old file -- date clamped to 1980
+ok
diff -Nru mercurial-1.6.2/tests/test-bisect.out mercurial-1.6.4/tests/test-bisect.out
--- mercurial-1.6.2/tests/test-bisect.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-bisect.out	2010-10-01 15:18:50.000000000 +0000
@@ -237,7 +237,7 @@
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     msg 1
 
-abort: Inconsistent state, 31:58c80a7c8a40 is good and bad
+abort: starting revisions are not directly related
 error
 Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
 5cd978ea5149
diff -Nru mercurial-1.6.2/tests/test-bookmarks-strip mercurial-1.6.4/tests/test-bookmarks-strip
--- mercurial-1.6.2/tests/test-bookmarks-strip	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-bookmarks-strip	2010-10-01 15:18:50.000000000 +0000
@@ -43,3 +43,18 @@
 echo % list bookmarks
 hg book
 
+echo '% test immediate rollback and reentrancy issue'
+echo "mq=!" >> $HGRCPATH
+hg init repo
+cd repo
+echo a > a
+hg ci -Am adda
+echo b > b
+hg ci -Am addb
+hg bookmarks markb
+hg rollback
+hg bookmarks
+hg bookmarks markb
+hg bookmarks
+cd ..
+
diff -Nru mercurial-1.6.2/tests/test-bookmarks-strip.out mercurial-1.6.4/tests/test-bookmarks-strip.out
--- mercurial-1.6.2/tests/test-bookmarks-strip.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-bookmarks-strip.out	2010-10-01 15:18:50.000000000 +0000
@@ -16,3 +16,9 @@
 % list bookmarks
  * test                      1:9f1b7e78eff8
  * test2                     1:9f1b7e78eff8
+% test immediate rollback and reentrancy issue
+adding a
+adding b
+rolling back to revision 0 (undo commit)
+no bookmarks set
+ * markb                     0:07f494440405
diff -Nru mercurial-1.6.2/tests/test-cat.out mercurial-1.6.4/tests/test-cat.out
--- mercurial-1.6.2/tests/test-cat.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-cat.out	2010-10-01 15:18:50.000000000 +0000
@@ -4,5 +4,5 @@
 0
 0
 0
-a: No such file in rev 03f6b0774996
+a: no such file in rev 03f6b0774996
 1
diff -Nru mercurial-1.6.2/tests/test-churn mercurial-1.6.4/tests/test-churn
--- mercurial-1.6.2/tests/test-churn	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-churn	2010-10-01 15:18:50.000000000 +0000
@@ -38,7 +38,9 @@
 echo % churn with aliases
 cat > ../aliases < branchclone.py
+from mercurial import ui, hg
+myui = ui.ui()
+repo = hg.repository(myui, 'a')
+hg.clone(myui, repo, dest="ua", branch=["stable",])
+EOF
+
+python branchclone.py
+rm -r ua
+
 exit 0
diff -Nru mercurial-1.6.2/tests/test-clone.out mercurial-1.6.4/tests/test-clone.out
--- mercurial-1.6.2/tests/test-clone.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-clone.out	2010-10-01 15:18:50.000000000 +0000
@@ -314,3 +314,10 @@
 e8ece76546a6
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 14 changesets with 14 changes to 3 files
+updating to branch stable
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -Nru mercurial-1.6.2/tests/test-convert-cvs mercurial-1.6.4/tests/test-convert-cvs
--- mercurial-1.6.2/tests/test-convert-cvs	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-convert-cvs	2010-10-01 15:18:50.000000000 +0000
@@ -132,12 +132,23 @@
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
+echo % commit new file revisions with some fuzz
+cd src
+sleep 1
+echo f >> a
+cvscall -q commit -mfuzzy . | grep '<--' |\
+    sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
+sleep 4 # the two changes will be split if fuzz < 4
+echo g >> b/c
+cvscall -q commit -mfuzzy . | grep '<--' |\
+    sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
+cd ..
+
 echo % convert again
-hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
+hg convert --config convert.cvsps.fuzz=2 src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 
-echo "graphlog = " >> $HGRCPATH
 hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n'
 
 echo % testing debugcvsps
 cd src
-hg debugcvsps | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/' 
+hg debugcvsps --fuzz=2 | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/' 
diff -Nru mercurial-1.6.2/tests/test-convert-cvs.out mercurial-1.6.4/tests/test-convert-cvs.out
--- mercurial-1.6.2/tests/test-convert-cvs.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-convert-cvs.out	2010-10-01 15:18:50.000000000 +0000
@@ -150,18 +150,27 @@
 0 Initial revision files: b/c
 % commit a new revision with funny log message
 checking in src/a,v
+% commit new file revisions with some fuzz
+checking in src/a,v
+checking in src/b/c,v
 % convert again
 connecting to cvsrepo
 scanning source...
 collecting CVS rlog
-9 log entries
-cvslog hook: 9 entries
+11 log entries
+cvslog hook: 11 entries
 creating changesets
-6 changeset entries
-cvschangesets hook: 6 changesets
+8 changeset entries
+cvschangesets hook: 8 changesets
 sorting...
 converting...
-0 funny
+2 funny
+1 fuzzy
+0 fuzzy
+o  8 (branch) fuzzy files: b/c
+|
+o  7 (branch) fuzzy files: a
+|
 o  6 (branch) funny
 |  ----------------------------
 |  log message files: a
@@ -179,11 +188,11 @@
 
 % testing debugcvsps
 collecting CVS rlog
-9 log entries
-cvslog hook: 9 entries
+11 log entries
+cvslog hook: 11 entries
 creating changesets
-8 changeset entries
-cvschangesets hook: 8 changesets
+10 changeset entries
+cvschangesets hook: 10 changesets
 ---------------------
 PatchSet 1 
 Date:
@@ -286,3 +295,27 @@
 Members: 
 	a:1.2->1.2.2.1 
 
+---------------------
+PatchSet 9 
+Date:
+Author:
+Branch: branch
+Tag: (none) 
+Log:
+fuzzy
+
+Members: 
+	a:1.2.2.1->1.2.2.2 
+
+---------------------
+PatchSet 10 
+Date:
+Author:
+Branch: branch
+Tag: (none) 
+Log:
+fuzzy
+
+Members: 
+	b/c:1.1.2.1->1.1.2.2 
+
diff -Nru mercurial-1.6.2/tests/test-convert-darcs mercurial-1.6.4/tests/test-convert-darcs
--- mercurial-1.6.2/tests/test-convert-darcs	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-convert-darcs	2010-10-01 15:18:50.000000000 +0000
@@ -17,6 +17,9 @@
     exit 80
 fi
 
+echo '% try converting darcs1 repository'
+hg convert -s darcs "$TESTDIR/darcs/darcs1" 2>&1 | grep darcs-1.0
+
 echo % initialize darcs repo
 mkdir darcs-repo
 cd darcs-repo
@@ -56,13 +59,18 @@
 rm dir/d2
 darcs mv dir dir2
 darcs record -a -l -m p3
-cd ..
+
+echo % test utf-8 commit message and author
+echo g > g
+# darcs is encoding agnostic, so it takes whatever bytes it's given
+darcs record -a -l -m 'p4: desc ñ' -A 'author ñ'
 
 glog()
 {
-    hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
+    HGENCODING=utf-8 hg glog --template '{rev} "{desc|firstline}" ({author}) files: {files}\n' "$@"
 }
 
+cd ..
 hg convert darcs-repo darcs-repo-hg
 # The converter does not currently handle patch conflicts very well.
 # When they occur, it reverts *all* changes and moves forward,
diff -Nru mercurial-1.6.2/tests/test-convert-darcs.out mercurial-1.6.4/tests/test-convert-darcs.out
--- mercurial-1.6.2/tests/test-convert-darcs.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-convert-darcs.out	2010-10-01 15:18:50.000000000 +0000
@@ -1,3 +1,5 @@
+% try converting darcs1 repository
+darcs-1.0 repository format is unsupported, please upgrade
 % initialize darcs repo
 Finished recording patch 'p0'
 % branch and update
@@ -12,26 +14,32 @@
 Finished recording patch 'p2'
 % test file and directory move
 Finished recording patch 'p3'
+% test utf-8 commit message and author
+Finished recording patch 'p4: desc ñ'
 initializing destination darcs-repo-hg repository
 scanning source...
 sorting...
 converting...
-4 p0
-3 p1.2
-2 p1.1
-1 p2
-0 p3
-o  4 "p3" files: dir/d dir/d2 dir2/d f ff
+5 p0
+4 p1.2
+3 p1.1
+2 p2
+1 p3
+0 p4: desc ?
+o  5 "p4: desc ñ" (author ñ) files: g
 |
-o  3 "p2" files: a dir/d dir/d2 f
+o  4 "p3" (test@example.org) files: dir/d dir/d2 dir2/d f ff
 |
-o  2 "p1.1" files:
+o  3 "p2" (test@example.org) files: a dir/d dir/d2 f
 |
-o  1 "p1.2" files: a b
+o  2 "p1.1" (test@example.org) files:
 |
-o  0 "p0" files: a
+o  1 "p1.2" (test@example.org) files: a b
+|
+o  0 "p0" (test@example.org) files: a
 
 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644   a
 1e88685f5ddec574a34c70af492f95b6debc8741 644   b
 37406831adc447ec2385014019599dfec953c806 644   dir2/d
 b783a337463792a5c7d548ad85a7d3253c16ba8c 644   ff
+0973eb1b2ecc4de7fafe7447ce1b7462108b4848 644   g
diff -Nru mercurial-1.6.2/tests/test-convert.out mercurial-1.6.4/tests/test-convert.out
--- mercurial-1.6.2/tests/test-convert.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-convert.out	2010-10-01 15:18:50.000000000 +0000
@@ -24,7 +24,7 @@
     understood by the source).
 
     If no destination directory name is specified, it defaults to the basename
-    of the source with '-hg' appended. If the destination repository doesn't
+    of the source with "-hg" appended. If the destination repository doesn't
     exist, it will be created.
 
     By default, all sources except Mercurial will use --branchsort. Mercurial
@@ -48,13 +48,17 @@
        
 
     If the file doesn't exist, it's automatically created. It's updated on
-    each commit copied, so convert-repo can be interrupted and can be run
+    each commit copied, so "hg convert" can be interrupted and can be run
     repeatedly to copy new commits.
 
-    The [username mapping] file is a simple text file that maps each source
+    The username mapping file is a simple text file that maps each source
     commit author to a destination commit author. It is handy for source SCMs
     that use unix logins to identify authors (eg: CVS). One line per author
-    mapping and the line format is: srcauthor=whatever string you want
+    mapping and the line format is:
+
+      source author = destination author
+
+    Empty lines and lines starting with a "#" are ignored.
 
     The filemap is a file that allows filtering and remapping of files and
     directories. Each line can contain one of the following directives:
@@ -65,40 +69,48 @@
 
       rename path/to/source path/to/destination
 
-    Comment lines start with '#'. A specificed path matches if it equals the
+    Comment lines start with "#". A specificed path matches if it equals the
     full relative name of a file or one of its parent directories. The
-    'include' or 'exclude' directive with the longest matching path applies,
+    "include" or "exclude" directive with the longest matching path applies,
     so line order does not matter.
 
-    The 'include' directive causes a file, or all files under a directory, to
+    The "include" directive causes a file, or all files under a directory, to
     be included in the destination repository, and the exclusion of all other
-    files and directories not explicitly included. The 'exclude' directive
-    causes files or directories to be omitted. The 'rename' directive renames
+    files and directories not explicitly included. The "exclude" directive
+    causes files or directories to be omitted. The "rename" directive renames
     a file or directory if is converted. To rename from a subdirectory into
-    the root of the repository, use '.' as the path to rename to.
+    the root of the repository, use "." as the path to rename to.
 
     The splicemap is a file that allows insertion of synthetic history,
     letting you specify the parents of a revision. This is useful if you want
     to e.g. give a Subversion merge two parents, or graft two disconnected
     series of history together. Each entry contains a key, followed by a
-    space, followed by one or two comma-separated values. The key is the
-    revision ID in the source revision control system whose parents should be
-    modified (same format as a key in .hg/shamap). The values are the revision
-    IDs (in either the source or destination revision control system) that
-    should be used as the new parents for that node. For example, if you have
-    merged "release-1.0" into "trunk", then you should specify the revision on
-    "trunk" as the first parent and the one on the "release-1.0" branch as the
-    second.
+    space, followed by one or two comma-separated values:
+
+      key parent1, parent2
+
+    The key is the revision ID in the source revision control system whose
+    parents should be modified (same format as a key in .hg/shamap). The
+    values are the revision IDs (in either the source or destination revision
+    control system) that should be used as the new parents for that node. For
+    example, if you have merged "release-1.0" into "trunk", then you should
+    specify the revision on "trunk" as the first parent and the one on the
+    "release-1.0" branch as the second.
 
     The branchmap is a file that allows you to rename a branch when it is
     being brought in from whatever external repository. When used in
     conjunction with a splicemap, it allows for a powerful combination to help
     fix even the most badly mismanaged repositories and turn them into nicely
     structured Mercurial repositories. The branchmap contains lines of the
-    form "original_branch_name new_branch_name". "original_branch_name" is the
-    name of the branch in the source repository, and "new_branch_name" is the
-    name of the branch is the destination repository. This can be used to (for
-    instance) move code in one repository from "default" to a named branch.
+    form:
+
+      original_branch_name new_branch_name
+
+    where "original_branch_name" is the name of the branch in the source
+    repository, and "new_branch_name" is the name of the branch is the
+    destination repository. No whitespace is allowed in the branch names. This
+    can be used to (for instance) move code in one repository from "default"
+    to a named branch.
 
     Mercurial Source
     ----------------
diff -Nru mercurial-1.6.2/tests/test-convert-svn-sink mercurial-1.6.4/tests/test-convert-svn-sink
--- mercurial-1.6.2/tests/test-convert-svn-sink	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-convert-svn-sink	2010-10-01 15:18:50.000000000 +0000
@@ -29,6 +29,7 @@
 echo a > a/a
 mkdir -p a/d1/d2
 echo b > a/d1/d2/b
+ln -s a/missing a/link
 echo % add
 hg --cwd a ci -d '0 0' -A -m 'add a file'
 
@@ -43,6 +44,7 @@
 cmp a/a a-hg-wc/a && echo same || echo different
 
 hg --cwd a mv a b
+hg --cwd a mv link newlink
 echo % rename
 hg --cwd a ci -d '2 0' -m 'rename a file'
 hg --cwd a tip -q
@@ -134,3 +136,15 @@
 hg convert -d svn b
 echo % expect 4 changes
 svnupanddisplay b-hg-wc 0
+
+echo % tags are not supported, but must not break conversion
+
+rm -rf a a-hg a-hg-wc
+hg init a
+echo a > a/a
+hg --cwd a ci -d '0 0' -A -m 'Add file a'
+hg --cwd a tag -d '1 0' -m 'Tagged as v1.0' v1.0
+
+hg convert -d svn a
+svnupanddisplay a-hg-wc 2
+rm -rf a a-hg a-hg-wc
diff -Nru mercurial-1.6.2/tests/test-convert-svn-sink.out mercurial-1.6.4/tests/test-convert-svn-sink.out
--- mercurial-1.6.2/tests/test-convert-svn-sink.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-convert-svn-sink.out	2010-10-01 15:18:50.000000000 +0000
@@ -1,8 +1,9 @@
 % add
 adding a
 adding d1/d2/b
+adding link
 % modify
-1:e0e2b8a9156b
+1:8231f652da37
 assuming destination a-hg
 initializing svn repository 'a-hg'
 initializing svn working copy 'a-hg-wc'
@@ -17,6 +18,7 @@
  2 1 test d1
  2 1 test d1/d2
  2 1 test d1/d2/b
+ 2 1 test link
 
 
 /d1/d2
 /d1/d2/b
+/link
 
 add a file
 
@@ -49,13 +53,15 @@
 a:
 a
 d1
+link
 
 a-hg-wc:
 a
 d1
+link
 same
 % rename
-2:eb5169441d43
+2:a67e26ccec09
 assuming destination a-hg
 initializing svn working copy 'a-hg-wc'
 scanning source...
@@ -68,6 +74,7 @@
  3 1 test d1
  3 1 test d1/d2
  3 1 test d1/d2/b
+ 3 3 test newlink
 
 
 /b
+/newlink
+/link
 
 rename a file
 
@@ -88,12 +101,14 @@
 a:
 b
 d1
+newlink
 
 a-hg-wc:
 b
 d1
+newlink
 % copy
-3:60effef6ab48
+3:0cf087b9ab02
 assuming destination a-hg
 initializing svn working copy 'a-hg-wc'
 scanning source...
@@ -107,6 +122,7 @@
  4 1 test d1
  4 1 test d1/d2
  4 1 test d1/d2/b
+ 4 3 test newlink
 
 
 
 
 
 
 base
 
 
+% tags are not supported, but must not break conversion
+adding a
+assuming destination a-hg
+initializing svn repository 'a-hg'
+initializing svn working copy 'a-hg-wc'
+scanning source...
+sorting...
+converting...
+1 Add file a
+0 Tagged as v1.0
+writing Subversion tags is not yet implemented
+At revision 2.
+ 2 2 test .
+ 2 1 test a
+ 2 2 test .hgtags
+
+
+
+test
+
+
+/.hgtags
+
+Tagged as v1.0
+
+
+test
+
+
+/a
+
+Add file a
+
+
diff -Nru mercurial-1.6.2/tests/test-diff-upgrade mercurial-1.6.4/tests/test-diff-upgrade
--- mercurial-1.6.2/tests/test-diff-upgrade	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-diff-upgrade	2010-10-01 15:18:50.000000000 +0000
@@ -20,6 +20,7 @@
 chmod +x unsetexec
 echo binary > binary
 python -c "file('rmbinary', 'wb').write('\0')"
+python -c "file('bintoregular', 'wb').write('\0')"
 hg ci -Am addfiles
 echo regular >> regular
 echo newregular >> newregular
@@ -28,6 +29,7 @@
 rm rmregular
 echo exec >> exec
 echo newexec > newexec
+echo bintoregular > bintoregular
 chmod +x newexec
 rm rmexec
 chmod +x setexec
@@ -43,10 +45,11 @@
 echo '% git=no: git diff for single regular file'
 hg autodiff --git=yes regular
 
-echo '% git=auto: regular diff for regular files and removals'
-hg autodiff --git=auto regular newregular rmregular rmbinary rmexec
+echo '% git=auto: regular diff for regular files and non-binary removals'
+hg autodiff --git=auto regular newregular rmregular rmexec
 
-for f in exec newexec setexec unsetexec binary newbinary newempty rmempty; do
+for f in exec newexec setexec unsetexec binary newbinary newempty rmempty \
+    rmbinary bintoregular; do
     echo '% git=auto: git diff for' $f
     hg autodiff --git=auto $f
 done
diff -Nru mercurial-1.6.2/tests/test-diff-upgrade.out mercurial-1.6.4/tests/test-diff-upgrade.out
--- mercurial-1.6.2/tests/test-diff-upgrade.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-diff-upgrade.out	2010-10-01 15:18:50.000000000 +0000
@@ -1,5 +1,6 @@
 % make a combination of new, changed and deleted file
 adding binary
+adding bintoregular
 adding exec
 adding regular
 adding rmbinary
@@ -17,40 +18,42 @@
 removing rmexec
 removing rmregular
 % git=no: regular diff for all files
-diff -r b3f053cd7c7f binary
+diff -r a66d19b9302d binary
 Binary file binary has changed
-diff -r b3f053cd7c7f exec
+diff -r a66d19b9302d bintoregular
+Binary file bintoregular has changed
+diff -r a66d19b9302d exec
 --- a/exec
 +++ b/exec
 @@ -1,1 +1,2 @@
  exec
 +exec
-diff -r b3f053cd7c7f newbinary
+diff -r a66d19b9302d newbinary
 Binary file newbinary has changed
-diff -r b3f053cd7c7f newexec
+diff -r a66d19b9302d newexec
 --- /dev/null
 +++ b/newexec
 @@ -0,0 +1,1 @@
 +newexec
-diff -r b3f053cd7c7f newregular
+diff -r a66d19b9302d newregular
 --- /dev/null
 +++ b/newregular
 @@ -0,0 +1,1 @@
 +newregular
-diff -r b3f053cd7c7f regular
+diff -r a66d19b9302d regular
 --- a/regular
 +++ b/regular
 @@ -1,1 +1,2 @@
  regular
 +regular
-diff -r b3f053cd7c7f rmbinary
+diff -r a66d19b9302d rmbinary
 Binary file rmbinary has changed
-diff -r b3f053cd7c7f rmexec
+diff -r a66d19b9302d rmexec
 --- a/rmexec
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -rmexec
-diff -r b3f053cd7c7f rmregular
+diff -r a66d19b9302d rmregular
 --- a/rmregular
 +++ /dev/null
 @@ -1,1 +0,0 @@
@@ -62,32 +65,30 @@
 @@ -1,1 +1,2 @@
  regular
 +regular
-% git=auto: regular diff for regular files and removals
-diff -r b3f053cd7c7f newregular
+% git=auto: regular diff for regular files and non-binary removals
+diff -r a66d19b9302d newregular
 --- /dev/null
 +++ b/newregular
 @@ -0,0 +1,1 @@
 +newregular
-diff -r b3f053cd7c7f regular
+diff -r a66d19b9302d regular
 --- a/regular
 +++ b/regular
 @@ -1,1 +1,2 @@
  regular
 +regular
-diff -r b3f053cd7c7f rmbinary
-Binary file rmbinary has changed
-diff -r b3f053cd7c7f rmexec
+diff -r a66d19b9302d rmexec
 --- a/rmexec
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -rmexec
-diff -r b3f053cd7c7f rmregular
+diff -r a66d19b9302d rmregular
 --- a/rmregular
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -rmregular
 % git=auto: git diff for exec
-diff -r b3f053cd7c7f exec
+diff -r a66d19b9302d exec
 --- a/exec
 +++ b/exec
 @@ -1,1 +1,2 @@
@@ -129,56 +130,71 @@
 % git=auto: git diff for rmempty
 diff --git a/rmempty b/rmempty
 deleted file mode 100644
+% git=auto: git diff for rmbinary
+diff --git a/rmbinary b/rmbinary
+deleted file mode 100644
+Binary file rmbinary has changed
+% git=auto: git diff for bintoregular
+diff --git a/bintoregular b/bintoregular
+index f76dd238ade08917e6712764a16a22005a50573d..9c42f2b6427d8bf034b7bc23986152dc01bfd3ab
+GIT binary patch
+literal 13
+Uc$`bh%qz(+N=+}#Ni5<5043uE82|tP
+
 % git=warn: regular diff with data loss warnings
-diff -r b3f053cd7c7f binary
+diff -r a66d19b9302d binary
 Binary file binary has changed
-diff -r b3f053cd7c7f exec
+diff -r a66d19b9302d bintoregular
+Binary file bintoregular has changed
+diff -r a66d19b9302d exec
 --- a/exec
 +++ b/exec
 @@ -1,1 +1,2 @@
  exec
 +exec
-diff -r b3f053cd7c7f newbinary
+diff -r a66d19b9302d newbinary
 Binary file newbinary has changed
-diff -r b3f053cd7c7f newexec
+diff -r a66d19b9302d newexec
 --- /dev/null
 +++ b/newexec
 @@ -0,0 +1,1 @@
 +newexec
-diff -r b3f053cd7c7f newregular
+diff -r a66d19b9302d newregular
 --- /dev/null
 +++ b/newregular
 @@ -0,0 +1,1 @@
 +newregular
-diff -r b3f053cd7c7f regular
+diff -r a66d19b9302d regular
 --- a/regular
 +++ b/regular
 @@ -1,1 +1,2 @@
  regular
 +regular
-diff -r b3f053cd7c7f rmbinary
+diff -r a66d19b9302d rmbinary
 Binary file rmbinary has changed
-diff -r b3f053cd7c7f rmexec
+diff -r a66d19b9302d rmexec
 --- a/rmexec
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -rmexec
-diff -r b3f053cd7c7f rmregular
+diff -r a66d19b9302d rmregular
 --- a/rmregular
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -rmregular
 data lost for: binary
+data lost for: bintoregular
 data lost for: newbinary
 data lost for: newempty
 data lost for: newexec
+data lost for: rmbinary
 data lost for: rmempty
 data lost for: setexec
 data lost for: unsetexec
 % git=abort: fail on execute bit change
 abort: losing data for setexec
 % git=abort: succeed on regular file
-diff -r b3f053cd7c7f regular
+diff -r a66d19b9302d regular
 --- a/regular
 +++ b/regular
 @@ -1,1 +1,2 @@
diff -Nru mercurial-1.6.2/tests/test-dispatch mercurial-1.6.4/tests/test-dispatch
--- mercurial-1.6.2/tests/test-dispatch	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-dispatch	2010-10-01 15:18:50.000000000 +0000
@@ -21,10 +21,6 @@
 EOF
 hg cat a
 
-echo '% working directory removed'
-rm -rf $dir/a
-hg --version
-
 echo '% no repo'
 cd $dir
 hg cat
diff -Nru mercurial-1.6.2/tests/test-dispatch.out mercurial-1.6.4/tests/test-dispatch.out
--- mercurial-1.6.2/tests/test-dispatch.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-dispatch.out	2010-10-01 15:18:50.000000000 +0000
@@ -32,8 +32,6 @@
 use "hg -v help cat" to show global options
 % [defaults]
 a
-a: No such file in rev 000000000000
-% working directory removed
-abort: error getting current working directory: No such file or directory
+a: no such file in rev 000000000000
 % no repo
 abort: There is no Mercurial repository here (.hg not found)!
diff -Nru mercurial-1.6.2/tests/test-doctest.py mercurial-1.6.4/tests/test-doctest.py
--- mercurial-1.6.2/tests/test-doctest.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-doctest.py	2010-10-01 15:18:50.000000000 +0000
@@ -5,18 +5,13 @@
 import doctest
 
 import mercurial.changelog
-# test doctest from changelog
-
 doctest.testmod(mercurial.changelog)
 
-import mercurial.httprepo
-doctest.testmod(mercurial.httprepo)
-
-import mercurial.util
-doctest.testmod(mercurial.util)
-
 import mercurial.dagparser
 doctest.testmod(mercurial.dagparser, optionflags=doctest.NORMALIZE_WHITESPACE)
 
+import mercurial.url
+doctest.testmod(mercurial.url)
+
 import hgext.convert.cvsps
 doctest.testmod(hgext.convert.cvsps)
diff -Nru mercurial-1.6.2/tests/test-eol-update.out mercurial-1.6.4/tests/test-eol-update.out
--- mercurial-1.6.2/tests/test-eol-update.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-eol-update.out	2010-10-01 15:18:50.000000000 +0000
@@ -25,8 +25,8 @@
 merging a.txt
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 % printrepr.py a.txt
-first\r
-third\r
+first
+third
 % hg diff
 diff --git a/a.txt b/a.txt
 --- a/a.txt
@@ -57,8 +57,8 @@
 merging a.txt
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 % printrepr.py a.txt
-first\r
-third\r
+first
+third
 % hg diff
 diff --git a/a.txt b/a.txt
 --- a/a.txt
diff -Nru mercurial-1.6.2/tests/test-gendoc mercurial-1.6.4/tests/test-gendoc
--- mercurial-1.6.2/tests/test-gendoc	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-gendoc	2010-10-01 15:18:50.000000000 +0000
@@ -11,7 +11,7 @@
     echo "% extracting documentation from $LOCALE"
     echo ".. -*- coding: utf-8 -*-" > gendoc-$LOCALE.txt
     echo "" >> gendoc-$LOCALE.txt
-    LC_ALL=$LOCALE python $TESTDIR/../doc/gendoc.py >> gendoc-$LOCALE.txt || exit
+    LC_ALL=$LOCALE python $TESTDIR/../doc/gendoc.py >> gendoc-$LOCALE.txt 2> /dev/null || exit
 
     # We call runrst without adding "--halt warning" to make it report
     # all errors instead of stopping on the first one.
diff -Nru mercurial-1.6.2/tests/test-git-import mercurial-1.6.4/tests/test-git-import
--- mercurial-1.6.2/tests/test-git-import	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-git-import	2010-10-01 15:18:50.000000000 +0000
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. $TESTDIR/helpers.sh
+
 hg init a
 cd a
 
@@ -226,5 +228,20 @@
 copy to foo3
 EOF
 hg tip -q
-
 cat foo3
+
+echo % move text file and patch as binary
+echo a > text2
+hg ci -Am0
+hg import -d "1000000 0" -m rename-as-binary - <<"EOF"
+diff --git a/text2 b/binary2
+rename from text2
+rename to binary2
+index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757
+GIT binary patch
+literal 5
+Mc$`b*O5$Pw00T?_*Z=?k
+
+EOF
+cat binary2 | repr
+hg st --copies --change .
\ No newline at end of file
diff -Nru mercurial-1.6.2/tests/test-git-import.out mercurial-1.6.4/tests/test-git-import.out
--- mercurial-1.6.2/tests/test-git-import.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-git-import.out	2010-10-01 15:18:50.000000000 +0000
@@ -80,3 +80,10 @@
 applying patch from stdin
 14:c4cd9cdeaa74
 foo
+% move text file and patch as binary
+adding text2
+applying patch from stdin
+'a\nb\n\x00'
+A binary2
+  text2
+R text2
diff -Nru mercurial-1.6.2/tests/test-globalopts.out mercurial-1.6.4/tests/test-globalopts.out
--- mercurial-1.6.2/tests/test-globalopts.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-globalopts.out	2010-10-01 15:18:50.000000000 +0000
@@ -56,8 +56,8 @@
 %% earlygetopt short option without following space
 0:b6c483daf290
 %% earlygetopt with illegal abbreviations
-abort: Option --config may not be abbreviated!
-abort: Option --cwd may not be abbreviated!
+abort: option --config may not be abbreviated!
+abort: option --cwd may not be abbreviated!
 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
@@ -184,7 +184,7 @@
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
- resolve      various operations to help finish a merge
+ resolve      redo merges or set/view the merge status of files
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction (dangerous)
  root         print the root (top) of the current working directory
@@ -256,7 +256,7 @@
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
- resolve      various operations to help finish a merge
+ resolve      redo merges or set/view the merge status of files
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction (dangerous)
  root         print the root (top) of the current working directory
diff -Nru mercurial-1.6.2/tests/test-help.out mercurial-1.6.4/tests/test-help.out
--- mercurial-1.6.2/tests/test-help.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-help.out	2010-10-01 15:18:50.000000000 +0000
@@ -77,7 +77,7 @@
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
- resolve      various operations to help finish a merge
+ resolve      redo merges or set/view the merge status of files
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction (dangerous)
  root         print the root (top) of the current working directory
@@ -145,7 +145,7 @@
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
- resolve      various operations to help finish a merge
+ resolve      redo merges or set/view the merge status of files
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction (dangerous)
  root         print the root (top) of the current working directory
@@ -601,7 +601,7 @@
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
- resolve      various operations to help finish a merge
+ resolve      redo merges or set/view the merge status of files
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction (dangerous)
  root         print the root (top) of the current working directory
diff -Nru mercurial-1.6.2/tests/test-hgweb-commands mercurial-1.6.4/tests/test-hgweb-commands
--- mercurial-1.6.2/tests/test-hgweb-commands	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-hgweb-commands	2010-10-01 15:18:50.000000000 +0000
@@ -60,5 +60,19 @@
 echo % Static files
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/static/style.css'
 
+echo % Stop and restart with HGENCODING=cp932
+"$TESTDIR/killdaemons.py"
+HGENCODING=cp932 hg serve --config server.uncompressed=False -n test \
+    -p $HGPORT -d --pid-file=hg.pid -E errors.log
+cat hg.pid >> $DAEMON_PIDS
+
+# commit message with Japanese Kanji 'Noh', which ends with '\x5c'
+echo foo >> foo
+HGENCODING=cp932 hg ci -m `python -c 'print("\x94\x5c")'`
+
+echo % Graph json escape of multibyte character
+"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/graph/' \
+    | grep '^var data ='
+
 echo % ERRORS ENCOUNTERED
 cat errors.log
diff -Nru mercurial-1.6.2/tests/test-hgweb-commands.out mercurial-1.6.4/tests/test-hgweb-commands.out
--- mercurial-1.6.2/tests/test-hgweb-commands.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-hgweb-commands.out	2010-10-01 15:18:50.000000000 +0000
@@ -982,4 +982,7 @@
 	position: relative;
 	top: -1px;
 }
+% Stop and restart with HGENCODING=cp932
+% Graph json escape of multibyte character
+var data = [["40b4d6888e92", [0, 1], [[0, 0, 1]], "\u80fd", "test", "1970-01-01", ["stable", true], ["tip"]], ["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "1970-01-01", ["stable", false], []], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "1970-01-01", ["default", true], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "1970-01-01", ["default", false], ["1.0"]]];
 % ERRORS ENCOUNTERED
diff -Nru mercurial-1.6.2/tests/test-hgwebdir mercurial-1.6.4/tests/test-hgwebdir
--- mercurial-1.6.2/tests/test-hgwebdir	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-hgwebdir	2010-10-01 15:18:50.000000000 +0000
@@ -26,6 +26,10 @@
 echo c > c/c
 hg --cwd c ci -Amc -d'3 0'
 
+# create repository without .hg/store
+hg init nostore
+rm -R nostore/.hg/store
+
 root=`pwd`
 cd ..
 
@@ -112,6 +116,20 @@
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/?style=raw'
 
 
+"$TESTDIR/killdaemons.py"
+cat > paths.conf <> $DAEMON_PIDS
+echo % test inexistent and inaccessible repo should be ignored silently
+"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/'
+
+
 cat > collections.conf <
+
+
+
+
+
+
+Mercurial repositories index
+
+
+
+

+

+
+mercurial
+

+

+
Mercurial Repositories

+
+
+    
+        
+        
+        
+        
+        
+    
+    
+
NameDescriptionContactLast modified 

+

+

+
+
+
+
+
 % collections: should succeed
 200 Script output follows
 
diff -Nru mercurial-1.6.2/tests/test-hgweb.out mercurial-1.6.4/tests/test-hgweb.out
--- mercurial-1.6.2/tests/test-hgweb.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-hgweb.out	2010-10-01 15:18:50.000000000 +0000
@@ -276,6 +276,7 @@
 tr.dark, .parity1 { background-color:#f6f6f0; }
 tr.dark:hover, .parity1:hover { background-color:#edece6; }
 td { padding:2px 5px; font-size:12px; vertical-align:top; }
+td.closed { background-color: #99f; }
 td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }
 td.indexlinks { white-space: nowrap; }
 td.indexlinks a {
diff -Nru mercurial-1.6.2/tests/test-identify.out mercurial-1.6.4/tests/test-identify.out
--- mercurial-1.6.2/tests/test-identify.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-identify.out	2010-10-01 15:18:50.000000000 +0000
@@ -1,5 +1,5 @@
 % no repo
-abort: There is no Mercurial repository here (.hg not found)
+abort: there is no Mercurial repository here (.hg not found)
 % create repo
 adding a
 % basic id usage
diff -Nru mercurial-1.6.2/tests/test-import-eol.out mercurial-1.6.4/tests/test-import-eol.out
--- mercurial-1.6.2/tests/test-import-eol.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-import-eol.out	2010-10-01 15:18:50.000000000 +0000
@@ -2,7 +2,7 @@
 adding a
 % invalid eol
 applying eol.diff
-abort: Unsupported line endings type: LFCR
+abort: unsupported line endings type: LFCR
 % force LF
 applying eol.diff
 'a\nyyyy\ncc\n\nd\ne'
diff -Nru mercurial-1.6.2/tests/test-install.out mercurial-1.6.4/tests/test-install.out
--- mercurial-1.6.2/tests/test-install.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-install.out	2010-10-01 15:18:50.000000000 +0000
@@ -14,5 +14,5 @@
 Checking commit editor...
 Checking username...
  no username supplied (see "hg help config")
- (specify a username in your .hgrc file)
+ (specify a username in your configuration file)
 1 problems detected, please check your install!
diff -Nru mercurial-1.6.2/tests/test-log mercurial-1.6.4/tests/test-log
--- mercurial-1.6.2/tests/test-log	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-log	2010-10-01 15:18:50.000000000 +0000
@@ -194,5 +194,26 @@
 cd dir
 hg log -p -R .. ../a
 
+cd ..
 
-exit 0
+echo '% issue2383'
+
+hg init issue2383
+cd issue2383
+echo a > a
+hg ci -Am0
+echo b > b
+hg ci -Am1
+hg co 0
+echo b > a
+hg ci -m2
+hg merge
+echo c > a
+hg ci -m3
+echo
+echo % diff
+hg diff --rev 2:3
+echo
+echo % log
+hg log -vpr 3
+cd ..
diff -Nru mercurial-1.6.2/tests/test-log.out mercurial-1.6.4/tests/test-log.out
--- mercurial-1.6.2/tests/test-log.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-log.out	2010-10-01 15:18:50.000000000 +0000
@@ -585,3 +585,48 @@
 @@ -0,0 +1,1 @@
 +a
 
+% issue2383
+adding a
+adding b
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+created new head
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+
+% diff
+diff -r b09be438c43a -r 8e07aafe1edc a
+--- a/a	Thu Jan 01 00:00:00 1970 +0000
++++ b/a	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,1 +1,1 @@
+-b
++c
+diff -r b09be438c43a -r 8e07aafe1edc b
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/b	Thu Jan 01 00:00:00 1970 +0000
+@@ -0,0 +1,1 @@
++b
+
+% log
+changeset:   3:8e07aafe1edc
+tag:         tip
+parent:      2:b09be438c43a
+parent:      1:925d80f479bb
+user:        test
+date:        Thu Jan 01 00:00:00 1970 +0000
+files:       a
+description:
+3
+
+
+diff -r b09be438c43a -r 8e07aafe1edc a
+--- a/a	Thu Jan 01 00:00:00 1970 +0000
++++ b/a	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,1 +1,1 @@
+-b
++c
+diff -r b09be438c43a -r 8e07aafe1edc b
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/b	Thu Jan 01 00:00:00 1970 +0000
+@@ -0,0 +1,1 @@
++b
+
diff -Nru mercurial-1.6.2/tests/test-mq.out mercurial-1.6.4/tests/test-mq.out
--- mercurial-1.6.2/tests/test-mq.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-mq.out	2010-10-01 15:18:50.000000000 +0000
@@ -99,7 +99,7 @@
 A B
 A series
 % init --mq without repo
-abort: There is no Mercurial repository here (.hg not found)
+abort: there is no Mercurial repository here (.hg not found)
 % init --mq with repo path
 ok
 % init --mq with nonexistent directory
diff -Nru mercurial-1.6.2/tests/test-mq-qrename mercurial-1.6.4/tests/test-mq-qrename
--- mercurial-1.6.2/tests/test-mq-qrename	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-mq-qrename	2010-10-01 15:18:50.000000000 +0000
@@ -36,4 +36,18 @@
 hg qcommit -m rename
 cd ..
 
-
+echo '% test overlapping renames (issue2388)'
+hg init c
+cd c
+hg qinit -c
+echo a > a
+hg add
+hg qnew patcha
+echo b > b
+hg add
+hg qnew patchb
+hg ci --mq -m c1
+hg qrename patchb patchc
+hg qrename patcha patchb
+hg st --mq
+cd ..
\ No newline at end of file
diff -Nru mercurial-1.6.2/tests/test-mq-qrename.out mercurial-1.6.4/tests/test-mq-qrename.out
--- mercurial-1.6.2/tests/test-mq-qrename.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-mq-qrename.out	2010-10-01 15:18:50.000000000 +0000
@@ -8,3 +8,10 @@
 new/dir
 .hg/patches/new/dir
 % test patch being renamed before committed
+% test overlapping renames (issue2388)
+adding a
+adding b
+M patchb
+M series
+A patchc
+R patcha
diff -Nru mercurial-1.6.2/tests/test-mq-safety mercurial-1.6.4/tests/test-mq-safety
--- mercurial-1.6.2/tests/test-mq-safety	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-mq-safety	2010-10-01 15:18:50.000000000 +0000
@@ -62,3 +62,29 @@
 hg up default
 hg log
 hg qpush
+cd ..
+
+echo '% testing applied patches, push and --force'
+hg init forcepush
+cd forcepush
+echo a > a
+hg ci -Am adda
+echo a >> a
+hg ci -m changea
+hg up 0
+hg branch branch
+echo b > b
+hg ci -Am addb
+hg up 0
+hg --cwd .. clone -r 0 forcepush forcepush2
+echo a >> a
+hg qnew patch
+echo '% pushing applied patch with --rev without --force'
+hg push -r default ../forcepush2
+echo '% pushing applied patch with branchhash, without --force'
+hg push ../forcepush2#default
+echo '% pushing revs excluding applied patch'
+hg push --new-branch -r branch -r 2 ../forcepush2
+echo '% pushing applied patch with --force'
+hg push --force -r default ../forcepush2
+cd ..
diff -Nru mercurial-1.6.2/tests/test-mq-safety.out mercurial-1.6.4/tests/test-mq-safety.out
--- mercurial-1.6.2/tests/test-mq-safety.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-mq-safety.out	2010-10-01 15:18:50.000000000 +0000
@@ -45,3 +45,36 @@
 
 applying qp
 now at: qp
+% testing applied patches, push and --force
+adding a
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+marked working directory as branch branch
+adding b
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+updating to branch default
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+% pushing applied patch with --rev without --force
+pushing to ../forcepush2
+abort: source has mq patches applied
+% pushing applied patch with branchhash, without --force
+pushing to ../forcepush2
+abort: source has mq patches applied
+% pushing revs excluding applied patch
+pushing to ../forcepush2
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+% pushing applied patch with --force
+pushing to ../forcepush2
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files (+1 heads)
diff -Nru mercurial-1.6.2/tests/test-mq-symlinks mercurial-1.6.4/tests/test-mq-symlinks
--- mercurial-1.6.2/tests/test-mq-symlinks	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-mq-symlinks	2010-10-01 15:18:50.000000000 +0000
@@ -55,3 +55,21 @@
 hg qpop
 hg qpush
 hg st -c
+
+echo '% replace broken symlink with another broken symlink'
+ln -s linka linka
+hg add linka
+hg qnew link
+hg mv linka linkb
+rm linkb
+ln -sf linkb linkb
+hg qnew movelink
+hg qpop
+hg qpush
+$TESTDIR/readlink.py linkb
+echo '% check patch does not overwrite untracked symlinks'
+hg qpop
+ln -s linkbb linkb
+hg qpush
+
+true
diff -Nru mercurial-1.6.2/tests/test-mq-symlinks.out mercurial-1.6.4/tests/test-mq-symlinks.out
--- mercurial-1.6.2/tests/test-mq-symlinks.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-mq-symlinks.out	2010-10-01 15:18:50.000000000 +0000
@@ -29,3 +29,16 @@
 C b
 C c
 C s
+% replace broken symlink with another broken symlink
+popping movelink
+now at: link
+applying movelink
+now at: movelink
+linkb -> linkb
+% check patch does not overwrite untracked symlinks
+popping movelink
+now at: link
+applying movelink
+patch failed, unable to continue (try -v)
+patch failed, rejects left in working dir
+errors during apply, please fix and refresh movelink
diff -Nru mercurial-1.6.2/tests/test-notify mercurial-1.6.4/tests/test-notify
--- mercurial-1.6.2/tests/test-notify	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-notify	2010-10-01 15:18:51.000000000 +0000
@@ -41,7 +41,7 @@
 # of the very long subject line
 echo '% pull (minimal config)'
 hg --traceback --cwd b pull ../a 2>&1 |
-  python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
+  python -c 'import sys,re; print re.sub("([n:])\\n[\\t ]", "\\1 ", sys.stdin.read()),' |
   sed -e 's/\(Message-Id:\).*/\1/' \
   -e 's/changeset \([0-9a-f]* *\)in .*test-notif/changeset \1in test-notif/' \
   -e 's/^details: .*test-notify/details: test-notify/' \
diff -Nru mercurial-1.6.2/tests/test-notify-changegroup mercurial-1.6.4/tests/test-notify-changegroup
--- mercurial-1.6.2/tests/test-notify-changegroup	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-notify-changegroup	2010-10-01 15:18:51.000000000 +0000
@@ -10,7 +10,7 @@
 [notify]
 sources = push
 diffstat = False
-maxsubject = 200
+maxsubject = 10
 
 [usersubs]
 foo@bar = *
@@ -37,7 +37,7 @@
     python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
     sed -e 's/\(Message-Id:\).*/\1/' \
         -e 's/changeset \([0-9a-f]* *\)in .*test-notif/changeset \1in test-notif/' \
-        -e 's/^Subject: .*test-notify/Subject: test-notify/' \
+        -e 's/^Subject: .*/Subject: test-notify-changegroup/' \
         -e 's/^details: .*test-notify/details: test-notify/' \
         -e 's/^Date:.*/Date:/'
 
diff -Nru mercurial-1.6.2/tests/test-notify-changegroup.out mercurial-1.6.4/tests/test-notify-changegroup.out
--- mercurial-1.6.2/tests/test-notify-changegroup.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-notify-changegroup.out	2010-10-01 15:18:51.000000000 +0000
@@ -15,7 +15,7 @@
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Date:
-Subject: test-notify-changegroup/a: 2 new changesets
+Subject: test-notify-changegroup
 From: test
 X-Hg-Notification: changeset cb9a9f314b8b
 Message-Id:
diff -Nru mercurial-1.6.2/tests/test-rebase-mq-skip mercurial-1.6.4/tests/test-rebase-mq-skip
--- mercurial-1.6.2/tests/test-rebase-mq-skip	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-rebase-mq-skip	2010-10-01 15:18:51.000000000 +0000
@@ -44,3 +44,33 @@
 hg up -C qtip
 hg rebase | hidebackup
 hg glog  --template '{rev} {desc} tags: {tags}\n'
+
+echo
+echo '% Now with --continue'
+cd ..
+hg init b
+cd b
+hg qinit -c # This must work even with a managed mq queue
+
+for i in r0 r1 r2 r3 r4 r5 r6;
+do
+	echo $i > $i
+	hg ci -Am $i
+done
+hg qimport -r 1:tip
+hg up 0
+for i in r1 r3 r7 r8;
+do
+	echo $i > $i
+	hg ci -Am branch2-$i
+done
+echo somethingelse > r4
+hg ci -Am branch2-r4
+echo r6 > r6
+hg ci -Am branch2-r6
+
+hg up qtip
+HGMERGE=internal:fail hg rebase | hidebackup
+HGMERGE=internal:local hg resolve --all
+hg rebase --continue | hidebackup
+hg glog  --template '{rev} {desc} tags: {tags}\n'
diff -Nru mercurial-1.6.2/tests/test-rebase-mq-skip.out mercurial-1.6.4/tests/test-rebase-mq-skip.out
--- mercurial-1.6.2/tests/test-rebase-mq-skip.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-rebase-mq-skip.out	2010-10-01 15:18:51.000000000 +0000
@@ -15,3 +15,43 @@
 |
 o  0 C1 tags:
 
+
+% Now with --continue
+adding r0
+adding r1
+adding r2
+adding r3
+adding r4
+adding r5
+adding r6
+0 files updated, 0 files merged, 6 files removed, 0 files unresolved
+adding r1
+created new head
+adding r3
+adding r7
+adding r8
+adding r4
+adding r6
+3 files updated, 0 files merged, 2 files removed, 0 files unresolved
+abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+saved backup bundle to 
+@  9 r5 tags: 5.diff qtip tip
+|
+o  8 r4 tags: 4.diff
+|
+o  7 r2 tags: 2.diff qbase
+|
+o  6 branch2-r6 tags: qparent
+|
+o  5 branch2-r4 tags:
+|
+o  4 branch2-r8 tags:
+|
+o  3 branch2-r7 tags:
+|
+o  2 branch2-r3 tags:
+|
+o  1 branch2-r1 tags:
+|
+o  0 r0 tags:
+
diff -Nru mercurial-1.6.2/tests/test-remove mercurial-1.6.4/tests/test-remove
--- mercurial-1.6.2/tests/test-remove	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-remove	2010-10-01 15:18:51.000000000 +0000
@@ -2,6 +2,7 @@
 
 remove() {
     hg rm $@
+    echo "exit code: $?"
     hg st
     # do not use ls -R, which recurses in .hg subdirs on Mac OS X 10.5
     find . -name .hg -prune -o -type f -print | sort
diff -Nru mercurial-1.6.2/tests/test-remove.out mercurial-1.6.4/tests/test-remove.out
--- mercurial-1.6.2/tests/test-remove.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-remove.out	2010-10-01 15:18:51.000000000 +0000
@@ -1,83 +1,100 @@
 % file not managed
 not removing foo: file is untracked
+exit code: 1
 ? foo
 ./foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 00 state added, options none
 not removing bar: file has been marked for add (use -f to force removal)
+exit code: 1
 A bar
 ./bar
 ./foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 01 state clean, options none
+exit code: 0
 R foo
 ? bar
 ./bar
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 02 state modified, options none
 not removing foo: file is modified (use -f to force removal)
+exit code: 1
 M foo
 ? bar
 ./bar
 ./foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 03 state missing, options none
+exit code: 0
 R foo
 ? bar
 ./bar
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 10 state added, options -f
+exit code: 0
 ? bar
 ./bar
 ./foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 11 state clean, options -f
+exit code: 0
 R foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 12 state modified, options -f
+exit code: 0
 R foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 13 state missing, options -f
+exit code: 0
 R foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 20 state added, options -A
 not removing bar: file still exists (use -f to force removal)
+exit code: 1
 A bar
 ./bar
 ./foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 21 state clean, options -A
 not removing foo: file still exists (use -f to force removal)
+exit code: 1
 ? bar
 ./bar
 ./foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 22 state modified, options -A
 not removing foo: file still exists (use -f to force removal)
+exit code: 1
 M foo
 ? bar
 ./bar
 ./foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 23 state missing, options -A
+exit code: 0
 R foo
 ? bar
 ./bar
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 30 state added, options -Af
+exit code: 0
 ? bar
 ./bar
 ./foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 31 state clean, options -Af
+exit code: 0
 R foo
 ./foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 32 state modified, options -Af
+exit code: 0
 R foo
 ./foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 33 state missing, options -Af
+exit code: 0
 R foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding test/bar
@@ -85,6 +102,7 @@
 % dir, options none
 removing test/bar
 removing test/foo
+exit code: 0
 R test/bar
 R test/foo
 ./foo
@@ -92,6 +110,7 @@
 % dir, options -f
 removing test/bar
 removing test/foo
+exit code: 0
 R test/bar
 R test/foo
 ./foo
@@ -99,6 +118,7 @@
 % dir, options -A
 not removing test/foo: file still exists (use -f to force removal)
 removing test/bar
+exit code: 1
 R test/bar
 ./foo
 ./test/foo
@@ -106,6 +126,7 @@
 % dir, options -Af
 removing test/bar
 removing test/foo
+exit code: 0
 R test/bar
 R test/foo
 ./foo
diff -Nru mercurial-1.6.2/tests/test-rename mercurial-1.6.4/tests/test-rename
--- mercurial-1.6.2/tests/test-rename	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-rename	2010-10-01 15:18:51.000000000 +0000
@@ -158,6 +158,13 @@
 hg update -C
 rm d1/ca
 
+echo "# attempt to overwrite an existing broken symlink"
+ln -s ba d1/ca
+hg rename --traceback d1/ba d1/ca
+hg status -C
+hg update -C
+rm d1/ca
+
 echo "# replace a symlink with a file"
 ln -s ba d1/ca
 hg rename --force d1/ba d1/ca
diff -Nru mercurial-1.6.2/tests/test-rename.out mercurial-1.6.4/tests/test-rename.out
--- mercurial-1.6.2/tests/test-rename.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-rename.out	2010-10-01 15:18:51.000000000 +0000
@@ -213,6 +213,10 @@
   d1/ba
 R d1/ba
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+# attempt to overwrite an existing broken symlink
+d1/ca: not overwriting - file exists
+? d1/ca
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 # replace a symlink with a file
 A d1/ca
   d1/ba
diff -Nru mercurial-1.6.2/tests/test-revert.out mercurial-1.6.4/tests/test-revert.out
--- mercurial-1.6.2/tests/test-revert.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-revert.out	2010-10-01 15:18:51.000000000 +0000
@@ -37,7 +37,7 @@
 %% should say file not managed
 file not managed: q
 %% should say file not found
-notfound: No such file in rev 095eacd0c0d7
+notfound: no such file in rev 095eacd0c0d7
 A z
 ? e.orig
 %% should add a, remove d, forget z
diff -Nru mercurial-1.6.2/tests/test-revset mercurial-1.6.4/tests/test-revset
--- mercurial-1.6.2/tests/test-revset	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-revset	2010-10-01 15:18:51.000000000 +0000
@@ -57,6 +57,11 @@
 
 hg tag -r6 1.0
 
+hg clone --quiet -U -r 7 . ../remote1
+hg clone --quiet -U -r 8 . ../remote2
+echo "[paths]" >> .hg/hgrc
+echo "default = ../remote1" >> .hg/hgrc
+
 # names that should work without quoting
 try a
 try b-a
@@ -105,6 +110,7 @@
 log 'file(b)'
 log 'follow()'
 log 'grep("issue\d+")'
+try 'grep("(")' # invalid regular expression
 log 'head()'
 log 'heads(6::)'
 log 'keyword(issue)'
@@ -112,6 +118,9 @@
 log 'max(contains(a))'
 log 'merge()'
 log 'modifies(b)'
+log 'outgoing()'
+log 'outgoing("../remote1")'
+log 'outgoing("../remote2")'
 log 'p1(merge())'
 log 'p2(merge())'
 log 'parents(merge())'
diff -Nru mercurial-1.6.2/tests/test-revset.out mercurial-1.6.4/tests/test-revset.out
--- mercurial-1.6.2/tests/test-revset.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-revset.out	2010-10-01 15:18:51.000000000 +0000
@@ -134,6 +134,9 @@
 9
 % log 'grep("issue\d+")'
 6
+% hg debugrevspec grep("(")
+('func', ('symbol', 'grep'), ('string', '('))
+hg: parse error: invalid match pattern: unbalanced parenthesis
 % log 'head()'
 0
 1
@@ -156,6 +159,18 @@
 6
 % log 'modifies(b)'
 4
+% log 'outgoing()'
+8
+9
+% log 'outgoing("../remote1")'
+8
+9
+% log 'outgoing("../remote2")'
+3
+5
+6
+7
+9
 % log 'p1(merge())'
 5
 % log 'p2(merge())'
diff -Nru mercurial-1.6.2/tests/test-symlink-os-yes-fs-no.py mercurial-1.6.4/tests/test-symlink-os-yes-fs-no.py
--- mercurial-1.6.2/tests/test-symlink-os-yes-fs-no.py	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-symlink-os-yes-fs-no.py	2010-10-01 15:18:51.000000000 +0000
@@ -1,5 +1,5 @@
-import os, sys
-from mercurial import hg, ui
+import os, sys, time
+from mercurial import hg, ui, commands
 
 TESTDIR = os.environ["TESTDIR"]
 
@@ -7,11 +7,35 @@
 if not hasattr(os, "symlink"):
     sys.exit(80) # SKIPPED_STATUS defined in run-tests.py
 
-# this is what symlink would do on a non-symlink file system
+# clone with symlink support
+u = ui.ui()
+hg.clone(u, os.path.join(TESTDIR, 'test-no-symlinks.hg'), 'test0')
+
+repo = hg.repository(u, 'test0')
+
+# wait a bit, or the status call wont update the dirstate
+time.sleep(1)
+commands.status(u, repo)
+
+# now disable symlink support -- this is what os.symlink would do on a
+# non-symlink file system
 def symlink_failure(src, dst):
     raise OSError, (1, "Operation not permitted")
 os.symlink = symlink_failure
 
-# now try cloning a repo which contains symlinks
+# dereference links as if a Samba server has exported this to a
+# Windows client
+for f in 'test0/a.lnk', 'test0/d/b.lnk':
+    os.unlink(f)
+    fp = open(f, 'wb')
+    fp.write(open(f[:-4]).read())
+    fp.close()
+
+# reload repository
+u = ui.ui()
+repo = hg.repository(u, 'test0')
+commands.status(u, repo)
+
+# try cloning a repo which contains symlinks
 u = ui.ui()
 hg.clone(u, os.path.join(TESTDIR, 'test-no-symlinks.hg'), 'test1')
diff -Nru mercurial-1.6.2/tests/test-symlink-os-yes-fs-no.py.out mercurial-1.6.4/tests/test-symlink-os-yes-fs-no.py.out
--- mercurial-1.6.2/tests/test-symlink-os-yes-fs-no.py.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-symlink-os-yes-fs-no.py.out	2010-10-01 15:18:51.000000000 +0000
@@ -5,3 +5,10 @@
 added 1 changesets with 4 changes to 4 files
 updating to branch default
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 4 changes to 4 files
+updating to branch default
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -Nru mercurial-1.6.2/tests/test-transplant.out mercurial-1.6.4/tests/test-transplant.out
--- mercurial-1.6.2/tests/test-transplant.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-transplant.out	2010-10-01 15:18:51.000000000 +0000
@@ -112,14 +112,14 @@
 Hunk #1 FAILED at 0
 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
 patch failed to apply
-abort: Fix up the merge and run hg transplant --continue
+abort: fix up the merge and run hg transplant --continue
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 applying a1e30dd1b8e7
 patching file foo
 Hunk #1 FAILED at 0
 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
 patch failed to apply
-abort: Fix up the merge and run hg transplant --continue
+abort: fix up the merge and run hg transplant --continue
 a1e30dd1b8e7 transplanted as f1563cf27039
 skipping already applied revision 1:a1e30dd1b8e7
 applying 1739ac5f6139
@@ -166,7 +166,7 @@
 created new head
 file b1 already exists
 1 out of 1 hunks FAILED -- saving rejects to file b1.rej
-abort: Fix up the merge and run hg transplant --continue
+abort: fix up the merge and run hg transplant --continue
 filtering
 applying 348b36d0b6a5
 patch failed to apply
diff -Nru mercurial-1.6.2/tests/test-url.py mercurial-1.6.4/tests/test-url.py
--- mercurial-1.6.2/tests/test-url.py	1970-01-01 00:00:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-url.py	2010-10-01 15:18:51.000000000 +0000
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+
+def check(a, b):
+    if a != b:
+        print (a, b)
+
+from mercurial.url import _verifycert
+
+# Test non-wildcard certificates        
+check(_verifycert({'subject': ((('commonName', 'example.com'),),)}, 'example.com'),
+    None)
+check(_verifycert({'subject': ((('commonName', 'example.com'),),)}, 'www.example.com'),
+    'certificate is for example.com')
+check(_verifycert({'subject': ((('commonName', 'www.example.com'),),)}, 'example.com'),
+    'certificate is for www.example.com')
+
+# Test wildcard certificates
+check(_verifycert({'subject': ((('commonName', '*.example.com'),),)}, 'www.example.com'),
+    None)
+check(_verifycert({'subject': ((('commonName', '*.example.com'),),)}, 'example.com'),
+    'certificate is for *.example.com')
+check(_verifycert({'subject': ((('commonName', '*.example.com'),),)}, 'w.w.example.com'),
+    'certificate is for *.example.com')
+
+# Avoid some pitfalls
+check(_verifycert({'subject': ((('commonName', '*.foo'),),)}, 'foo'),
+    'certificate is for *.foo')
+check(_verifycert({'subject': ((('commonName', '*o'),),)}, 'foo'),
+    'certificate is for *o')
+
+import time
+lastyear = time.gmtime().tm_year - 1
+nextyear = time.gmtime().tm_year + 1
+check(_verifycert({'notAfter': 'May  9 00:00:00 %s GMT' % lastyear}, 'example.com'),
+    'certificate expired May  9 00:00:00 %s GMT' % lastyear)
+check(_verifycert({'notBefore': 'May  9 00:00:00 %s GMT' % nextyear}, 'example.com'),
+    'certificate not valid before May  9 00:00:00 %s GMT' % nextyear)
+check(_verifycert({'notAfter': 'Sep 29 15:29:48 %s GMT' % nextyear, 'subject': ()}, 'example.com'),
+    'no commonName found in certificate')
+check(_verifycert(None, 'example.com'),
+    'no certificate received')
diff -Nru mercurial-1.6.2/tests/test-verify mercurial-1.6.4/tests/test-verify
--- mercurial-1.6.2/tests/test-verify	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-verify	2010-10-01 15:18:51.000000000 +0000
@@ -48,4 +48,12 @@
 echo % verify
 hg verify
 
+cd ..
+
+echo % test revlog format 0
+
+"$TESTDIR/revlog-formatv0.py"
+cd formatv0
+hg verify
+
 exit 0
diff -Nru mercurial-1.6.2/tests/test-verify.out mercurial-1.6.4/tests/test-verify.out
--- mercurial-1.6.2/tests/test-verify.out	2010-08-02 18:30:00.000000000 +0000
+++ mercurial-1.6.4/tests/test-verify.out	2010-10-01 15:18:51.000000000 +0000
@@ -50,3 +50,10 @@
 1 warnings encountered!
 1 integrity errors encountered!
 (first damaged changeset appears to be 0)
+% test revlog format 0
+repository uses revlog format 0
+checking changesets
+checking manifests
+crosschecking files in changesets and manifests
+checking files
+1 files, 1 changesets, 1 total revisions