← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

Committer: Aaron Bentley
Date: 2006-02-21 01:05:33 UTC
mfrom: (1556 +trunk)
mto: (2027.1.2 revert-subpath-56549)
mto: This revision was merged to the branch mainline in revision 1558.
Revision ID: aaron.bentley@utoronto.ca-20060221010533-8682182da8fbcc39

Merge from mainline

files added:
bzrlib/tests/blackbox/test_info.py

bzrlib/tests/workingtree_implementations/test_is_control_filename.py

files removed:
patches

files modified:
BRANCH.TODO

NEWS

bzrlib/__init__.py

bzrlib/add.py

bzrlib/branch.py

bzrlib/builtins.py

bzrlib/bzrdir.py

bzrlib/commands.py

bzrlib/errors.py

bzrlib/fetch.py

bzrlib/info.py

bzrlib/missing.py

bzrlib/progress.py

bzrlib/repository.py

bzrlib/tests/__init__.py

bzrlib/tests/blackbox/__init__.py

bzrlib/tests/blackbox/test_update.py

bzrlib/tests/blackbox/test_upgrade.py

bzrlib/tests/branch_implementations/test_branch.py

bzrlib/tests/bzrdir_implementations/test_bzrdir.py

bzrlib/tests/repository_implementations/test_fileid_involved.py

bzrlib/tests/repository_implementations/test_repository.py

bzrlib/tests/test_bzrdir.py

bzrlib/tests/test_errors.py

bzrlib/tests/test_repository.py

bzrlib/tests/test_ui.py

bzrlib/tests/test_upgrade.py

bzrlib/tests/workingtree_implementations/__init__.py

bzrlib/tests/workingtree_implementations/test_workingtree.py

bzrlib/transform.py

bzrlib/transport/__init__.py

bzrlib/ui/__init__.py

bzrlib/upgrade.py

bzrlib/workingtree.py

Show diffs side-by-side

added added

removed removed

bzrlib/__init__.py

16

16

17

17

"""bzr library"""

18

18

19

BZRDIR = ".bzr"

20

19

21

20

# please keep these sorted (in C locale order) to aid merging

22

21

DEFAULT_IGNORE = [

Older »