changeset 3182:f6c36cc92d02

Merge with crew
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 27 Sep 2006 21:44:20 +0200
parents 3637d5d17cbc (diff) eb0906ebba81 (current diff)
children 0e6b58c7beea
files
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Sep 27 08:27:16 2006 -0500
+++ b/mercurial/commands.py	Wed Sep 27 21:44:20 2006 +0200
@@ -574,7 +574,7 @@
         repo.add(names)
 
 def addremove(ui, repo, *pats, **opts):
-    """add all new files, delete all missing files (DEPRECATED)
+    """add all new files, delete all missing files
 
     Add all new files and remove all missing files from the repository.
 
@@ -2667,7 +2667,7 @@
           ('n', 'dry-run', None,
            _('do not perform actions, just print output')),
           ('s', 'similarity', '',
-           _('guess renamed files by similarity (0<=s<=1)'))],
+           _('guess renamed files by similarity (0<=s<=100)'))],
          _('hg addremove [OPTION]... [FILE]...')),
     "^annotate":
         (annotate,
--- a/tests/test-globalopts.out	Wed Sep 27 08:27:16 2006 -0500
+++ b/tests/test-globalopts.out	Wed Sep 27 21:44:20 2006 +0200
@@ -115,7 +115,7 @@
 list of commands (use "hg help -v" to show aliases and global options):
 
  add         add the specified files on the next commit
- addremove   add all new files, delete all missing files (DEPRECATED)
+ addremove   add all new files, delete all missing files
  annotate    show changeset information per file line
  archive     create unversioned archive of a repository revision
  backout     reverse effect of earlier changeset
@@ -162,7 +162,7 @@
 list of commands (use "hg help -v" to show aliases and global options):
 
  add         add the specified files on the next commit
- addremove   add all new files, delete all missing files (DEPRECATED)
+ addremove   add all new files, delete all missing files
  annotate    show changeset information per file line
  archive     create unversioned archive of a repository revision
  backout     reverse effect of earlier changeset
--- a/tests/test-help.out	Wed Sep 27 08:27:16 2006 -0500
+++ b/tests/test-help.out	Wed Sep 27 21:44:20 2006 +0200
@@ -39,7 +39,7 @@
 list of commands (use "hg help -v" to show aliases and global options):
 
  add         add the specified files on the next commit
- addremove   add all new files, delete all missing files (DEPRECATED)
+ addremove   add all new files, delete all missing files
  annotate    show changeset information per file line
  archive     create unversioned archive of a repository revision
  backout     reverse effect of earlier changeset
@@ -82,7 +82,7 @@
  verify      verify the integrity of the repository
  version     output version and copyright information
  add         add the specified files on the next commit
- addremove   add all new files, delete all missing files (DEPRECATED)
+ addremove   add all new files, delete all missing files
  annotate    show changeset information per file line
  archive     create unversioned archive of a repository revision
  backout     reverse effect of earlier changeset