diff --git a/tests/test-help.out b/tests/test-help.out
--- a/tests/test-help.out
+++ b/tests/test-help.out
@@ -1,39 +1,77 @@
 + hg help
-basic hg commands (use "hg help -v" for more):
-
- add        add the specified files on the next commit
- annotate   show changeset information per file line
- clone      make a copy of an existing repository
- commit     commit the specified files or all outstanding changes
- diff       diff working directory (or selected files)
- export     dump the header and diffs for one or more changesets
- init       create a new repository in the current directory
- log        show the revision history of the repository or a single file
- pull       pull changes from the specified source
- push       push changes to the specified destination
- remove     remove the specified files on the next commit
- revert     revert modified files or dirs back to their unmodified states
- serve      export the repository via HTTP
- status     show changed files in the working directory
- update     update or merge working directory
+ 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
+ cat         output the latest or given revision of a file
+ clone       make a copy of an existing repository
+ commit      commit the specified files or all outstanding changes
+ copy        mark a file as copied or renamed for the next commit
+ diff        diff working directory (or selected files)
+ export      dump the header and diffs for one or more changesets
+ forget      don't add the specified files on the next commit
+ heads       show current repository heads
+ help        show help for a given command or all commands
+ identify    print information about the working copy
+ import      import an ordered set of patches
+ init        create a new repository in the current directory
+ locate      locate files matching specific patterns
+ log         show the revision history of the repository or a single file
+ manifest    output the latest or given revision of the project manifest
+ parents     show the parents of the working dir or revision
+ paths       show path or list of available paths
+ pull        pull changes from the specified source
+ push        push changes to the specified destination
+ rawcommit   raw commit interface
+ recover     roll back an interrupted transaction
+ remove      remove the specified files on the next commit
+ revert      revert modified files or dirs back to their unmodified states
+ root        print the root (top) of the current working dir
+ serve       export the repository via HTTP
+ status      show changed files in the working directory
+ tag         add a tag for the current tip or a given revision
+ tags        list repository tags
+ tip         show the tip revision
+ undo        undo the last commit or pull
+ update      update or merge working directory
+ verify      verify the integrity of the repository
+ version     output version and copyright information
 + hg -q help
-basic hg commands (use "hg help -v" for more):
-
- add        add the specified files on the next commit
- annotate   show changeset information per file line
- clone      make a copy of an existing repository
- commit     commit the specified files or all outstanding changes
- diff       diff working directory (or selected files)
- export     dump the header and diffs for one or more changesets
- init       create a new repository in the current directory
- log        show the revision history of the repository or a single file
- pull       pull changes from the specified source
- push       push changes to the specified destination
- remove     remove the specified files on the next commit
- revert     revert modified files or dirs back to their unmodified states
- serve      export the repository via HTTP
- status     show changed files in the working directory
- update     update or merge working directory
+ 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
+ cat         output the latest or given revision of a file
+ clone       make a copy of an existing repository
+ commit      commit the specified files or all outstanding changes
+ copy        mark a file as copied or renamed for the next commit
+ diff        diff working directory (or selected files)
+ export      dump the header and diffs for one or more changesets
+ forget      don't add the specified files on the next commit
+ heads       show current repository heads
+ help        show help for a given command or all commands
+ identify    print information about the working copy
+ import      import an ordered set of patches
+ init        create a new repository in the current directory
+ locate      locate files matching specific patterns
+ log         show the revision history of the repository or a single file
+ manifest    output the latest or given revision of the project manifest
+ parents     show the parents of the working dir or revision
+ paths       show path or list of available paths
+ pull        pull changes from the specified source
+ push        push changes to the specified destination
+ rawcommit   raw commit interface
+ recover     roll back an interrupted transaction
+ remove      remove the specified files on the next commit
+ revert      revert modified files or dirs back to their unmodified states
+ root        print the root (top) of the current working dir
+ serve       export the repository via HTTP
+ status      show changed files in the working directory
+ tag         add a tag for the current tip or a given revision
+ tags        list repository tags
+ tip         show the tip revision
+ undo        undo the last commit or pull
+ update      update or merge working directory
+ verify      verify the integrity of the repository
+ version     output version and copyright information
 + hg add -h
 hg add: option -h not recognized
 hg add [FILE]...
@@ -69,20 +107,39 @@ diff working directory (or selected file
 hg: unknown command foo
 + hg -q commands
 hg: unknown command 'commands'
-basic hg commands (use "hg help -v" for more):
-
- add        add the specified files on the next commit
- annotate   show changeset information per file line
- clone      make a copy of an existing repository
- commit     commit the specified files or all outstanding changes
- diff       diff working directory (or selected files)
- export     dump the header and diffs for one or more changesets
- init       create a new repository in the current directory
- log        show the revision history of the repository or a single file
- pull       pull changes from the specified source
- push       push changes to the specified destination
- remove     remove the specified files on the next commit
- revert     revert modified files or dirs back to their unmodified states
- serve      export the repository via HTTP
- status     show changed files in the working directory
- update     update or merge working directory
+ 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
+ cat         output the latest or given revision of a file
+ clone       make a copy of an existing repository
+ commit      commit the specified files or all outstanding changes
+ copy        mark a file as copied or renamed for the next commit
+ diff        diff working directory (or selected files)
+ export      dump the header and diffs for one or more changesets
+ forget      don't add the specified files on the next commit
+ heads       show current repository heads
+ help        show help for a given command or all commands
+ identify    print information about the working copy
+ import      import an ordered set of patches
+ init        create a new repository in the current directory
+ locate      locate files matching specific patterns
+ log         show the revision history of the repository or a single file
+ manifest    output the latest or given revision of the project manifest
+ parents     show the parents of the working dir or revision
+ paths       show path or list of available paths
+ pull        pull changes from the specified source
+ push        push changes to the specified destination
+ rawcommit   raw commit interface
+ recover     roll back an interrupted transaction
+ remove      remove the specified files on the next commit
+ revert      revert modified files or dirs back to their unmodified states
+ root        print the root (top) of the current working dir
+ serve       export the repository via HTTP
+ status      show changed files in the working directory
+ tag         add a tag for the current tip or a given revision
+ tags        list repository tags
+ tip         show the tip revision
+ undo        undo the last commit or pull
+ update      update or merge working directory
+ verify      verify the integrity of the repository
+ version     output version and copyright information