~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Neil Martinsen-Burrell
  • Date: 2009-03-09 19:55:18 UTC
  • mto: (4095.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 4140.
  • Revision ID: nmb@wartburg.edu-20090309195518-zgangfenh061dks3
Use a more informative message when an ignore pattern matches existing version controlled files.  Fixes #248895

Show diffs side-by-side

added added

removed removed

Lines of Context:
2439
2439
        tree.unlock()
2440
2440
        if len(matches) > 0:
2441
2441
            print "Warning: the following files are version controlled and" \
2442
 
                  " match your ignore pattern:\n%s" % ("\n".join(matches),)
 
2442
                  " match your ignore pattern:\n%s" \
 
2443
                  "\nThese files will continue to be version controlled" \
 
2444
                  " unless you 'bzr remove' them." % ("\n".join(matches),)
2443
2445
 
2444
2446
 
2445
2447
class cmd_ignored(Command):