Rev 3353: (mbp) Clearer explanation of ignore/add in user guide. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3353
revision-id:pqm at pqm.ubuntu.com-20080410073653-vq10gbuoes5o2c0q
parent: pqm at pqm.ubuntu.com-20080410060333-ws6qe72jt38gs6lu
parent: mbp at sourcefrog.net-20080410005343-fskdg5wra14srnxw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-04-10 08:36:53 +0100
message:
  (mbp) Clearer explanation of ignore/add in user guide.
modified:
  doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
    ------------------------------------------------------------
    revno: 3350.2.1
    revision-id:mbp at sourcefrog.net-20080410005343-fskdg5wra14srnxw
    parent: pqm at pqm.ubuntu.com-20080409233555-n26cmi0y1hb98tf6
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: doc
    timestamp: Thu 2008-04-10 10:53:43 +1000
    message:
      Clearer explanation of ignore/add in user guide.
      
      From https://answers.launchpad.net/bzr/+question/28805
    modified:
      doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
=== modified file 'doc/en/user-guide/controlling_registration.txt'
--- a/doc/en/user-guide/controlling_registration.txt	2008-01-12 00:20:20 +0000
+++ b/doc/en/user-guide/controlling_registration.txt	2008-04-10 00:53:43 +0000
@@ -73,10 +73,10 @@
     config.h                 ./config.h
     configure.in~            *~
 
-It is OK to have either an ignore pattern match a versioned file, or to
-add an ignored file.  Ignore patterns have no effect on versioned files;
-they only determine whether unversioned files are reported as unknown or
-ignored.
+Note that ignore patterns are only matched against non-versioned files,
+and control whether they are treated as "unknown" or "ignored".  If a file
+is explicitly added, it remains versioned regardless of whether it matches
+an ignore pattern.
 
 The ``.bzrignore`` file should normally be versioned, so that new copies
 of the branch see the same patterns::