Viewing all changes in revision 5168.2.1.
- Committer: Andrew Bennetts
- Date: 2010-04-21 07:52:31 UTC
- mto: This revision was merged to the branch mainline in revision 5176.
- Revision ID: andrew.bennetts@canonical.com-20100421075231-2n8pfxbhlhqxic6w
Add example merge_file_content hook based on my answer to <https://answers.edge.launchpad.net/bzr/+question/103163>.
- files added:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- files removed:
- 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 renamed:
- bzrlib/doc_generate/conf.py => bzrlib/doc_generate/sphinx_conf.py
- bzrlib/tests/per_controldir/ => bzrlib/tests/per_bzrdir/
- bzrlib/tests/per_controldir/test_controldir.py => bzrlib/tests/per_bzrdir/test_bzrdir.py
- bzrlib/tests/per_controldir_colo/ => bzrlib/tests/per_bzrdir_colo/
- files modified:
- INSTALL
expand all
collapse all
added
removed
