merge with crew-stable
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Fri, 25 Jul 2008 13:27:06 +0200
changeset 6843 b114a8c7998f
parent 6840 80e51429cb9a (current diff)
parent 6842 e37fa751182a (diff)
child 6844 a38dff85d31f
merge with crew-stable
hgext/churn.py
mercurial/commands.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]'),
 }
--- 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: