/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/ignores.py

  • Committer: Robert Collins
  • Date: 2009-02-24 08:09:17 UTC
  • mfrom: (4037 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4038.
  • Revision ID: robertc@robertcollins.net-20090224080917-9k7ib4oj1godlp3k
Merge bzr (resolve conflicts).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ignores.py
213
213
    """Retrieve a list of ignores from the ignore file in a tree.
214
214
 
215
215
    :param tree: Tree to retrieve the ignore list from.
216
 
    :return: 
 
216
    :return:
217
217
    """
218
218
    ifn = tree.abspath(bzrlib.IGNORE_FILENAME)
219
219
    if tree.has_filename(ifn):