« back to all changes in this revision
Viewing changes to bzrlib/smart/vfs.py
- Committer: Andrew Bennetts
- Date: 2011-07-11 02:06:18 UTC
- mfrom: (6018 +trunk)
- mto: This revision was merged to the branch mainline in revision 6020.
- Revision ID: andrew.bennetts@canonical.com-20110711020618-gcjgoeb5azwjrnu6
Merge lp:bzr/2.4.
- files added:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files renamed:
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/bzr_distutils.py => tools/build_mo.py
- files modified:
- .bzrignore
added
removed
bzrlib/smart/vfs.py
