Mercurial > hg-stable

changeset 20795:29b159bd71bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 19 Mar 2014 16:21:53 -0500
parents 8b0e3a8982ea (current diff) 7f4cf938643d (diff)
children 131f7fe06e9e
files hgext/convert/__init__.py tests/test-convert.t
diffstat 2 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/__init__.py	Tue Mar 18 13:40:03 2014 -0700
+++ b/hgext/convert/__init__.py	Wed Mar 19 16:21:53 2014 -0500
@@ -101,9 +101,10 @@
     longest matching path applies, so line order does not matter.
 
     The ``include`` directive causes a file, or all files under a
-    directory, to be included in the destination repository, and the
-    exclusion of all other files and directories not explicitly
-    included. The ``exclude`` directive causes files or directories to
+    directory, to be included in the destination repository. The default
+    if there are no ``include`` statements is to include everything.
+    If there are any ``include`` statements, nothing else is included.
+    The ``exclude`` directive causes files or directories to
     be omitted. The ``rename`` directive renames a file or directory if
     it is converted. To rename from a subdirectory into the root of
     the repository, use ``.`` as the path to rename to.
--- a/tests/test-convert.t	Tue Mar 18 13:40:03 2014 -0700
+++ b/tests/test-convert.t	Wed Mar 19 16:21:53 2014 -0500
@@ -84,11 +84,12 @@
       so line order does not matter.
   
       The "include" directive causes a file, or all files under a directory, to
-      be included in the destination repository, and the exclusion of all other
-      files and directories not explicitly included. The "exclude" directive
-      causes files or directories to be omitted. The "rename" directive renames
-      a file or directory if it is converted. To rename from a subdirectory into
-      the root of the repository, use "." as the path to rename to.
+      be included in the destination repository. The default if there are no
+      "include" statements is to include everything. If there are any "include"
+      statements, nothing else is included. The "exclude" directive causes files
+      or directories to be omitted. The "rename" directive renames a file or
+      directory if it is converted. To rename from a subdirectory into the root
+      of the repository, use "." as the path to rename to.
   
       The splicemap is a file that allows insertion of synthetic history,
       letting you specify the parents of a revision. This is useful if you want