merge with crew-stable

hgext/churn.py

@@ -115,5 +115,5 b' cmdtable = {'
      [('r', 'rev', [], _('limit statistics to the specified revisions')),
       ('', 'aliases', '', _('file with email aliases')),
       ('', 'progress', None, _('show progress'))],
-    'hg churn [-r revision range] [-a file] [--progress]'),
+    'hg churn [-r REVISIONS] [--aliases FILE] [--progress]'),
 }

mercurial/commands.py

@@ -2798,6 +2798,8 b' def update(ui, repo, node=None, rev=None'
     If the requested revision is on a different named branch and the
     working directory is clean, update quietly switches branches.
 
+    If you want to update just one file to an older revision, use revert.
+
     See 'hg help dates' for a list of formats valid for --date.
     """
     if rev and node: