# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1216985226 -7200
# Node ID b114a8c7998f65e5f56a858ee5ddc845072dc01a
# Parent  80e51429cb9a658c7c85be3932b208e38ea17ef2# Parent  e37fa751182a7f519285a3a2c9caaa03ba27f16d
merge with crew-stable

diff -r 80e51429cb9a -r b114a8c7998f hgext/churn.py
--- a/hgext/churn.py	Thu Jul 24 16:32:52 2008 +0200
+++ b/hgext/churn.py	Fri Jul 25 13:27:06 2008 +0200
@@ -115,5 +115,5 @@
      [('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]'),
 }
diff -r 80e51429cb9a -r b114a8c7998f mercurial/commands.py
--- a/mercurial/commands.py	Thu Jul 24 16:32:52 2008 +0200
+++ b/mercurial/commands.py	Fri Jul 25 13:27:06 2008 +0200
@@ -2798,6 +2798,8 @@
     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: