Commit 88158814 authored by timeless developer's avatar timeless developer
Browse files

Improve English for help text of many core hg commands.

co-author: Greg Ward <greg-hg@gerg.ca>
parent c5f36402daad
This diff is collapsed.
......@@ -19,10 +19,10 @@ cat: a: No such file or directory
adding a
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
abort: cannot back out change on a different branch
abort: cannot backout change on a different branch
adding c
created new head
abort: cannot back out change on a different branch
abort: cannot backout change on a different branch
# backout with merge
adding a
reverting a
......@@ -54,7 +54,7 @@ created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
# backout of merge should fail
abort: cannot back out a merge changeset without --parent
abort: cannot backout a merge changeset without --parent
# backout of merge with bad parent should fail
abort: cb9a9f314b8b is not a parent of b2f3bb92043e
# backout of non-merge with parent should fail
......
......@@ -151,8 +151,8 @@ list of commands:
add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information per file line
archive create unversioned archive of a repository revision
annotate show changeset information by line for each file
archive create an unversioned archive of a repository revision
backout reverse effect of earlier changeset
bisect subdivision search of changesets
branch set or show the current branch name
......@@ -216,8 +216,8 @@ list of commands:
add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information per file line
archive create unversioned archive of a repository revision
annotate show changeset information by line for each file
archive create an unversioned archive of a repository revision
backout reverse effect of earlier changeset
bisect subdivision search of changesets
branch set or show the current branch name
......
......@@ -3,7 +3,7 @@ Mercurial Distributed SCM
basic commands:
add add the specified files on the next commit
annotate show changeset information per file line
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
......@@ -21,7 +21,7 @@ basic commands:
use "hg help" for the full list of commands or "hg -v" for details
add add the specified files on the next commit
annotate show changeset information per file line
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
......@@ -42,8 +42,8 @@ list of commands:
add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information per file line
archive create unversioned archive of a repository revision
annotate show changeset information by line for each file
archive create an unversioned archive of a repository revision
backout reverse effect of earlier changeset
bisect subdivision search of changesets
branch set or show the current branch name
......@@ -103,8 +103,8 @@ additional help topics:
use "hg -v help" to show aliases and global options
add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information per file line
archive create unversioned archive of a repository revision
annotate show changeset information by line for each file
archive create an unversioned archive of a repository revision
backout reverse effect of earlier changeset
bisect subdivision search of changesets
branch set or show the current branch name
......@@ -248,10 +248,10 @@ show changed files in the working directory
Show status of files in the repository. If names are given, only
files that match are shown. Files that are clean or ignored or
source of a copy/move operation, are not listed unless -c/--clean,
-i/--ignored, -C/--copies or -A/--all is given. Unless options
described with "show only ..." are given, the options -mardu are
used.
the source of a copy/move operation, are not listed unless
-c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
Unless options described with "show only ..." are given, the
options -mardu are used.
Option -q/--quiet hides untracked (unknown and ignored) files
unless explicitly requested with -u/--unknown or -i/--ignored.
......@@ -262,7 +262,8 @@ show changed files in the working directory
to one merge parent.
If one revision is given, it is used as the base revision.
If two revisions are given, the difference between them is shown.
If two revisions are given, the differences between them are
shown.
The codes used to show the status of files are:
M = modified
......@@ -272,7 +273,7 @@ show changed files in the working directory
! = missing (deleted by non-hg command, but still tracked)
? = not tracked
I = ignored
= the previous added file was copied from here
= origin of the previous file listed as A (added)
options:
......@@ -301,7 +302,7 @@ Mercurial Distributed SCM
basic commands:
add add the specified files on the next commit
annotate show changeset information per file line
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
......@@ -324,7 +325,7 @@ Mercurial Distributed SCM
basic commands:
add add the specified files on the next commit
annotate show changeset information per file line
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
......
......@@ -5,7 +5,7 @@ Mercurial Distributed SCM
basic commands:
add add the specified files on the next commit
annotate show changeset information per file line
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
......
......@@ -6,7 +6,7 @@ Mercurial Distributed SCM
basic commands:
add add the specified files on the next commit
annotate show changeset information per file line
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment