merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 18 Apr 2011 20:52:08 -0500
changeset 13954 1184bb274cb3
parent 13953 ae10a5e8e558 (current diff)
parent 13952 1416b9118540 (diff)
child 13956 ffb5c09ba822
child 13978 19b2f1c93253
merge with stable
mercurial/commands.py
--- a/mercurial/commands.py	Tue Apr 19 01:08:35 2011 +0300
+++ b/mercurial/commands.py	Mon Apr 18 20:52:08 2011 -0500
@@ -2344,17 +2344,17 @@
              num=None, id=None, branch=None, tags=None, bookmarks=None):
     """identify the working copy or specified revision
 
-    With no revision, print a summary of the current state of the
+    Print a summary identifiying the repository state at REV
+    using one or two parent hash identifiers, followed by a
+    "+" if there are uncommitted changes in the working directory,
+    the branch name (omitted if default) and a list of tags, bookmarks.
+
+    When REV is not given, print a summary of the current state of the
     repository.
 
     Specifying a path to a repository root or Mercurial bundle will
     cause lookup to operate on that repository/bundle.
 
-    This summary identifies the repository state using one or two
-    parent hash identifiers, followed by a "+" if there are
-    uncommitted changes in the working directory, a list of tags for
-    this revision and a branch name for non-default branches.
-
     Returns 0 if successful.
     """