To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 5487.1.1.
- Committer: Vincent Ladeuil
- Date: 2010-10-12 09:46:37 UTC
- mfrom: (5448.6.7 506730-add-no-tree-to-bzr-push)
- mto: This revision was merged to the branch mainline in revision 5488.
- Revision ID: v.ladeuil+lp@free.fr-20101012094637-bfb8q6oa9njthqks
Merge lp:~mgordon/bzr/506730-add-no-tree-to-bzr-push resolving conflicts and fixing NEWS entry
- files added:
- bzrlib/controldir.py
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/tests/per_bzrdir
- files removed:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- files renamed:
- bzrlib/doc_generate/sphinx_conf.py => bzrlib/doc_generate/conf.py
- bzrlib/tests/per_bzrdir/ => bzrlib/tests/per_controldir/
- bzrlib/tests/per_bzrdir/test_bzrdir.py => bzrlib/tests/per_controldir/test_controldir.py
- bzrlib/tests/per_bzrdir_colo/ => bzrlib/tests/per_controldir_colo/
- files modified:
- INSTALL
expand all
collapse all
added
removed
