--- a/hgext/bugzilla.py Tue Jun 05 22:46:14 2012 +0200
+++ b/hgext/bugzilla.py Wed Jun 06 21:17:33 2012 -0500
@@ -657,8 +657,9 @@
if self.bzvermajor >= 4:
args['ids'] = [bugid]
args['comment'] = {'body' : text}
- args['status'] = self.fixstatus
- args['resolution'] = self.fixresolution
+ if 'fix' in newstate:
+ args['status'] = self.fixstatus
+ args['resolution'] = self.fixresolution
self.bzproxy.Bug.update(args)
else:
if 'fix' in newstate:
--- a/i18n/ru.po Tue Jun 05 22:46:14 2012 +0200
+++ b/i18n/ru.po Wed Jun 06 21:17:33 2012 -0500
@@ -172,7 +172,7 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2012-05-27 18:16+0400\n"
+"POT-Creation-Date: 2012-06-05 10:52+0400\n"
"PO-Revision-Date: 2011-05-12 23:48+0400\n"
"Last-Translator: Alexander Sauta <demosito@gmail.com>\n"
"Language-Team: Russian\n"
@@ -22620,6 +22620,9 @@
msgid "could not symlink to %r: %s"
msgstr "не удается создать символическую ссылку на %r: %s"
+msgid "empty revision range"
+msgstr "пустой диапазон ревизий"
+
#, python-format
msgid "recording removal of %s as rename to %s (%d%% similar)\n"
msgstr "удаление %s записывается как переименование в %s (похожесть %d%%)\n"
--- a/mercurial/commands.py Tue Jun 05 22:46:14 2012 +0200
+++ b/mercurial/commands.py Wed Jun 06 21:17:33 2012 -0500
@@ -5657,10 +5657,10 @@
current named branch and move the current bookmark (see :hg:`help
bookmarks`).
- If the changeset is not a descendant of the working directory's
- parent, the update is aborted. With the -c/--check option, the
- working directory is checked for uncommitted changes; if none are
- found, the working directory is updated to the specified
+ If the changeset is not a descendant or ancestor of the working
+ directory's parent, the update is aborted. With the -c/--check
+ option, the working directory is checked for uncommitted changes; if
+ none are found, the working directory is updated to the specified
changeset.
Update sets the working directory's parent revison to the specified