To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to breezy/merge3.py
- Committer: Martin
- Date: 2017-05-23 14:08:03 UTC
- mto: (6625.4.6 integration-bisect)
- mto: This revision was merged to the branch mainline in revision 6629.
- Revision ID: gzlist@googlemail.com-20170523140803-1bayist4qbqgvku8
Drop custom load_tests implementation and use unittest signature
- files added:
- NEWS
- breezy/branchfmt
- breezy/plugins/bash_completion
- breezy/plugins/bash_completion/tests
- breezy/plugins/changelog_merge
- breezy/plugins/changelog_merge/tests
- breezy/plugins/grep
- breezy/plugins/po_merge
- breezy/plugins/po_merge/tests
- breezy/plugins/weave_fmt
- breezy/plugins/weave_fmt/tests
- breezy/tests/per_bzrdir
- breezy/tests/per_repository_vf
- po
- files removed:
- bzr.ico
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/util/configobj
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- apport/bzr-crashdb.conf => apport/brz-crashdb.conf
- apport/source_bzr.py => apport/source_brz.py
- bzrlib/ => breezy/
- bzrlib/sign_my_commits.py => breezy/commit_signature_commands.py
- bzrlib/doc_generate/sphinx_conf.py => breezy/doc_generate/conf.py
- bzrlib/repofmt/weaverepo.py => breezy/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => breezy/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_bzrdir/ => breezy/tests/per_controldir/
- bzrlib/tests/per_bzrdir/test_bzrdir.py => breezy/tests/per_controldir/test_controldir.py
- bzrlib/tests/per_bzrdir_colo/ => breezy/tests/per_controldir_colo/
- bzrlib/tests/per_repository/test_is_write_locked.py => breezy/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => breezy/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => breezy/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => breezy/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => breezy/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => breezy/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => breezy/tests/per_repository_vf/test_merge_directive.py
- bzr => brz
- contrib/bash/bzrbashprompt.sh => contrib/bash/brzbashprompt.sh
- contrib/bzr_access => contrib/brz_access
- contrib/emacs/bzr-mode.el => contrib/emacs/brz-mode.el
- doc/developers/_static/bzr-doc.css => doc/developers/_static/brz-doc.css
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/en/_static/en/brz-en-quick-reference.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/en/_static/en/brz-en-quick-reference.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/en/_static/en/brz-en-quick-reference.svg
- NEWS => doc/en/release-notes/bzr-2.3.txt
- NEWS-template.txt => doc/en/release-notes/release-template.txt
- doc/en/tutorials/using_bazaar_with_launchpad.txt => doc/en/tutorials/using_breezy_with_launchpad.txt
- tools/bzr_epydoc => tools/brz_epydoc
- tools/bzr_epydoc_uid.py => tools/brz_epydoc_uid.py
- tools/win32/bzr-win32-bdist-postinstall.py => tools/win32/brz-win32-bdist-postinstall.py
- tools/win32/bzr.iss.cog => tools/win32/brz.iss.cog
- tools/win32/bzr_postinstall.py => tools/win32/brz_postinstall.py
- tools/win32/start_bzr.bat => tools/win32/start_brz.bat
- files modified:
- .bzrignore
added
removed
breezy/merge3.py
