merge with stable

hgext/bugzilla.py

@@ -657,8 +657,9 b' class bzxmlrpc(bzaccess):'
         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:

i18n/ru.po

@@ -172,7 +172,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\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 <[e-mail]>\n"
 "Language-Team: Russian\n"
@@ -22620,6 +22620,9 b' msgstr "\xd0\xbf\xd1\x83\xd1\x82\xd1\x8c %r \xd0\xbf\xd1\x80\xd0\xbe\xd1\x85\xd0\xbe\xd0\xb4\xd0\xb8\xd1\x82 \xd1\x81\xd0\xb8\xd0\xbc\xd0\xb2\xd0\xbe\xd0\xbb\xd0\xb8\xd1\x87\xd0\xb5\xd1\x81\xd0\xba\xd1\x83\xd1\x8e \xd1\x81\xd1\x81\xd1\x8b\xd0\xbb\xd0\xba\xd1\x83 %r"'
 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"

mercurial/commands.py

@@ -5657,10 +5657,10 b' def update(ui, repo, node=None, rev=None'
     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