Rev 5505: (vila) document the comment character in ignore files (Neil in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5505 [merge]
revision-id: pqm at pqm.ubuntu.com-20101018104738-4rhxk936z09b8t19
parent: pqm at pqm.ubuntu.com-20101015164148-k10lo687r72nzbtl
parent: nmb at wartburg.edu-20101018045538-sjavctdscbq1u5jx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2010-10-18 11:47:38 +0100
message:
  (vila) document the comment character in ignore files (Neil
   Martinsen-Burrell)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-10-15 11:30:54 +0000
+++ b/bzrlib/builtins.py	2010-10-18 04:55:38 +0000
@@ -2676,8 +2676,13 @@
     Patterns prefixed with '!!' act as regular ignore patterns, but have
     precedence over the '!' exception patterns.
 
-    Note: ignore patterns containing shell wildcards must be quoted from
-    the shell on Unix.
+    :Notes: 
+        
+    * Ignore patterns containing shell wildcards must be quoted from
+      the shell on Unix.
+
+    * Ignore patterns starting with "#" act as comments in the ignore file.
+      To ignore patterns that begin with that character, use the "RE:" prefix.
 
     :Examples:
         Ignore the top level Makefile::
@@ -2692,6 +2697,10 @@
 
             bzr ignore "!special.class"
 
+        Ignore files whose name begins with the "#" character::
+
+            bzr ignore "RE:^#"
+
         Ignore .o files under the lib directory::
 
             bzr ignore "lib/**/*.o"

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2010-10-15 15:05:09 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2010-10-18 04:55:38 +0000
@@ -58,6 +58,10 @@
 Documentation
 *************
 
+* Document the comment character in the .bzrignore file, including a
+  workaround for ignore patterns that begin with #.
+  (Neil Martinsen-Burrell, #621515)
+
 API Changes
 ***********