changeset 189:3c6c5b551c96

Merge backout.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 16 Apr 2007 14:23:11 -0700
parents d3dd1bedba3c (diff) b60e2de6dbc3 (current diff)
children cd066590e2e3
files en/examples/tour.commit-no-user.out
diffstat 2 files changed, 0 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/en/examples/filenames.glob.range.out	Mon Apr 16 14:19:31 2007 -0700
+++ b/en/examples/filenames.glob.range.out	Mon Apr 16 14:23:11 2007 -0700
@@ -1,7 +1,3 @@
 $ \textbf{hg status 'glob:**[nr-t]'}
-A examples/simple.py
 ? MANIFEST.in
-? examples/performant.py
-? src/watcher/_watcher.c
-? src/watcher/watcher.py
 ? src/xyzzy.txt
--- a/en/filenames.tex	Mon Apr 16 14:19:31 2007 -0700
+++ b/en/filenames.tex	Mon Apr 16 14:23:11 2007 -0700
@@ -152,15 +152,6 @@
 token.  This small example illustrates the difference between the two.
 \interaction{filenames.glob.star-starstar}
 
-When you're writing a glob pattern, bear in mind that Mercurial will
-treat a pattern that matches a directory name as ``match every file
-under that directory''.  For example, a glob pattern of
-``\texttt{**c}'' means \emph{both} ``match files ending in
-`\texttt{c}''' ``any file under all directories that end in
-`\texttt{c}'''.  I personally find this behaviour counterintuitive.
-If you need to write a pattern that means ``match \emph{only} files'',
-you'll need to express it as a regular expression instead; see below.
-
 \subsection{Regular expression matching with \texttt{re} patterns}
 
 Mercurial accepts the same regular expression syntax as the Python