« back to all changes in this revision
Viewing changes to bzrlib/push.py
- Committer: Vincent Ladeuil
- Date: 2010-08-25 10:20:41 UTC
- mfrom: (5390 +trunk)
- mto: (5401.1.1 integration) (4597.14.1 638451-malformed)
- mto: This revision was merged to the branch mainline in revision 5404.
- Revision ID: v.ladeuil+lp@free.fr-20100825102041-g4gn4h23ydsi3ngn
Merge bzr.dev into cleanup resolving conflicts
- 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
- 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
added
removed
bzrlib/push.py
