Viewing all changes in revision 1534.7.164.
- Committer: Aaron Bentley
- Date: 2006-02-14 17:23:26 UTC
- mto: (1558.1.4 Aaron's integration) (1534.9.2 Transactional Tree Transforms) (1185.50.82 bzr-jam-integration) (2027.1.2 revert-subpath-56549)
- mto: This revision was merged to the branch mainline in revision 1558.
- Revision ID: abentley@panoramicfeedback.com-20060214172326-ec4712d0549ff7cd
Updated test to new conflict message
- files added:
- NEWS.developers
- bzrlib/util/configobj/docs
- bzrlib/util/urlgrabber
- notes
- patches
- trash
- files removed:
- .testr.conf
- apport
- bzrlib/bundle
- bzrlib/bundle/serializer
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/filters
- bzrlib/help_topics
- bzrlib/help_topics/en
- bzrlib/help_topics/es
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/launchpad
- bzrlib/plugins/netrc_credential_store
- bzrlib/plugins/netrc_credential_store/tests
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/repofmt
- bzrlib/smart
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests/commands
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/tests/ftp_server
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_controldir_colo
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_interbranch
- bzrlib/tests/per_interrepository
- bzrlib/tests/per_intertree
- bzrlib/tests/per_inventory
- bzrlib/tests/per_lock
- bzrlib/tests/per_repository_chk
- bzrlib/tests/per_repository_reference
- bzrlib/tests/per_repository_vf
- bzrlib/tests/per_tree
- bzrlib/tests/per_uifactory
- bzrlib/tests/ssl_certs
- bzrlib/tests/test_patches_data
- bzrlib/transport/ftp
- bzrlib/transport/http
- bzrlib/util/tests
- bzrlib/version_info_formats
- contrib/debian
- doc/developers
- doc/developers/_static
- doc/developers/_templates
- doc/en
- doc/en/_static
- doc/en/_static/en
- doc/en/_templates
- doc/en/admin-guide
- doc/en/mini-tutorial
- doc/en/quick-reference
- doc/en/release-notes
- doc/en/tutorials
- doc/en/upgrade-guide
- doc/en/user-guide
- doc/en/user-guide/images
- doc/en/user-reference
- doc/en/whats-new
- doc/es
- doc/es/_static
- doc/es/_static/es
- doc/es/_templates
- doc/es/mini-tutorial
- doc/es/quick-reference
- doc/es/user-guide
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- doc/ru
- doc/ru/_static
- doc/ru/_static/ru
- doc/ru/_templates
- doc/ru/mini-tutorial
- doc/ru/quick-reference
- doc/ru/tutorials
- doc/ru/user-guide
- doc/ru/user-guide/images
- man1
- po
- tools/packaging
- tools/win32
- tools/win32/buildout-templates
- tools/win32/buildout-templates/bin
- files renamed:
- doc/developers/HACKING.txt => HACKING
- doc/en/release-notes/bzr-2.3.txt => NEWS
- bzrlib/store/versioned/__init__.py => bzrlib/store/weave.py
- bzrlib/tests/http_utils.py => bzrlib/tests/HTTPTestUtil.py
- bzrlib/tests/per_branch/ => bzrlib/tests/branch_implementations/
- bzrlib/tests/per_controldir/ => bzrlib/tests/bzrdir_implementations/
- bzrlib/tests/per_controldir/test_controldir.py => bzrlib/tests/bzrdir_implementations/test_bzrdir.py
- bzrlib/tests/per_repository/ => bzrlib/tests/repository_implementations/
- bzrlib/tests/per_repository/test_fileid_involved.py.THIS => bzrlib/tests/repository_implementations/test_fileid_involved.py
- bzrlib/tests/blackbox/test_annotate.py => bzrlib/tests/test_annotate.py
- bzrlib/tests/per_workingtree/test_basis_inventory.py => bzrlib/tests/test_basis_inventory.py
- bzrlib/tests/test_commands.py => bzrlib/tests/test_command.py
- bzrlib/tests/test_revisionspec.py => bzrlib/tests/test_revisionnamespaces.py
- bzrlib/tests/per_repository/test_revision.py => bzrlib/tests/test_revprops.py
- bzrlib/tests/per_transport.py => bzrlib/tests/test_transport_implementations.py
- bzrlib/tests/blackbox/test_uncommit.py => bzrlib/tests/test_uncommit.py
- bzrlib/tests/per_workingtree/ => bzrlib/tests/workingtree_implementations/
- bzrlib/transport/ftp/__init__.py => bzrlib/transport/ftp.py
- bzrlib/transport/http/__init__.py => bzrlib/transport/http.py
- bzrlib/win32utils.py => bzrlib/win32console.py
- bzrlib/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- bzrlib/xml8.py => bzrlib/xml5.py
- tools/generate_docs.py => generate_docs.py
- bzrlib/doc_generate/ => tools/doc_generate/
- bzrlib/bundle/__init__.py => trash/_changeset.py
- doc/en/tutorials/tutorial.txt => tutorial.txt
- files modified:
- .bzrignore
expand all
collapse all
added
removed
doc/Bazaar-Logo-For-Manuals.png
doc/developers/_static/bzr icon 16.png
doc/en/_static/bzr icon 16.png
doc/en/_static/en/bzr-en-quick-reference.png
doc/en/_static/en/bzr-en-quick-reference.svg
doc/en/user-guide/images/workflows_centralized.png
doc/en/user-guide/images/workflows_centralized.svg
doc/en/user-guide/images/workflows_gatekeeper.png
doc/en/user-guide/images/workflows_gatekeeper.svg
doc/en/user-guide/images/workflows_localcommit.png
doc/en/user-guide/images/workflows_localcommit.svg
doc/en/user-guide/images/workflows_peer.png
doc/en/user-guide/images/workflows_peer.svg
doc/en/user-guide/images/workflows_pqm.png
doc/en/user-guide/images/workflows_pqm.svg
doc/en/user-guide/images/workflows_shared.png
doc/en/user-guide/images/workflows_shared.svg
doc/en/user-guide/images/workflows_single.png
doc/en/user-guide/images/workflows_single.svg
doc/es/_static/bzr icon 16.png
doc/es/_static/es/bzr-es-quick-reference.png
doc/es/_static/es/bzr-es-quick-reference.svg
doc/ja/_static/bzr icon 16.png
doc/ja/user-guide/images/workflows_centralized.png
doc/ja/user-guide/images/workflows_centralized.svg
doc/ja/user-guide/images/workflows_gatekeeper.png
doc/ja/user-guide/images/workflows_gatekeeper.svg
doc/ja/user-guide/images/workflows_localcommit.png
doc/ja/user-guide/images/workflows_localcommit.svg
doc/ja/user-guide/images/workflows_peer.png
doc/ja/user-guide/images/workflows_peer.svg
doc/ja/user-guide/images/workflows_pqm.png
doc/ja/user-guide/images/workflows_pqm.svg
doc/ja/user-guide/images/workflows_shared.png
doc/ja/user-guide/images/workflows_shared.svg
doc/ja/user-guide/images/workflows_single.png
doc/ja/user-guide/images/workflows_single.svg
doc/ru/_static/bzr icon 16.png
doc/ru/_static/ru/bzr-ru-quick-reference.png
doc/ru/_static/ru/bzr-ru-quick-reference.svg
doc/ru/user-guide/images/workflows_centralized.png
doc/ru/user-guide/images/workflows_centralized.svg
doc/ru/user-guide/images/workflows_gatekeeper.png
doc/ru/user-guide/images/workflows_gatekeeper.svg
doc/ru/user-guide/images/workflows_localcommit.png
doc/ru/user-guide/images/workflows_localcommit.svg
doc/ru/user-guide/images/workflows_peer.png
doc/ru/user-guide/images/workflows_peer.svg
doc/ru/user-guide/images/workflows_pqm.png
doc/ru/user-guide/images/workflows_pqm.svg
doc/ru/user-guide/images/workflows_shared.png
doc/ru/user-guide/images/workflows_shared.svg
doc/ru/user-guide/images/workflows_single.png
doc/ru/user-guide/images/workflows_single.svg
