← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/controlling_registration.txt

  • Committer: Aaron Bentley
  • Date: 2008-04-24 04:58:42 UTC
  • mfrom: (3377 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3380.
  • Revision ID: aaron@aaronbentley.com-20080424045842-0cajl9v6s4u52kaw
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/controlling_registration.txt
73
73
    config.h                 ./config.h
74
74
    configure.in~            *~
75
75
 
76
 
It is OK to have either an ignore pattern match a versioned file, or to
77
 
add an ignored file.  Ignore patterns have no effect on versioned files;
78
 
they only determine whether unversioned files are reported as unknown or
79
 
ignored.
 
76
Note that ignore patterns are only matched against non-versioned files,
 
77
and control whether they are treated as "unknown" or "ignored".  If a file
 
78
is explicitly added, it remains versioned regardless of whether it matches
 
79
an ignore pattern.
80
80
 
81
81
The ``.bzrignore`` file should normally be versioned, so that new copies
82
82
of the branch see the same patterns::