← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Alexander Belchenko
  • Date: 2010-04-30 07:54:33 UTC
  • mto: This revision was merged to the branch mainline in revision 5196.
  • Revision ID: bialix@ukr.net-20100430075433-w19uwxoo2vds3mdt
rewrited docstring for tree_ignores_add_patterns function to reflect the reality. also changed literal .bzrignore to bzrlib.IGNORE_FILENAME to keep consistency within that function.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
30
30
    cleanup,
31
31
    errors,
32
32
    ui,
 
33
    repository,
33
34
    )
34
35
from bzrlib.trace import mutter
35
36
from bzrlib.tsort import topo_sort