Viewing all changes in revision 1185.13.2.
- Committer: Robert Collins
- Date: 2005-10-06 13:08:14 UTC
- mfrom: (1185.12.13)
- mto: (1417.1.4) (1185.41.1 bzr.sftp) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
- mto: This revision was merged to the branch mainline in revision 1419.
- Revision ID: robertc@robertcollins.net-20051006130814-90d99eeecdb3218f
Merge Aarons conflict plugin for 0.1rc1
- files added:
- NEWS.developers
- bzrlib/util/urlgrabber
- notes
- patches
- files removed:
- .testr.conf
- apport
- bzrlib/bundle
- bzrlib/bundle/serializer
- bzrlib/doc
- bzrlib/doc/api
- bzrlib/doc_generate
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/export
- 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/blackbox
- bzrlib/tests/commands
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/tests/ftp_server
- bzrlib/tests/per_branch
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_controldir
- 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
- 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/per_workingtree
- bzrlib/tests/ssl_certs
- bzrlib/tests/test_patches_data
- bzrlib/transport/ftp
- bzrlib/transport/http
- bzrlib/ui
- bzrlib/util/configobj
- 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/doc_generate/autodoc_man.py => bzr-man.py
- bzrlib/bundle/__init__.py => bzrlib/changeset.py
- bzrlib/conflicts.py => bzrlib/plugins/conflicts.py
- bzrlib/tests/ => bzrlib/selftest/
- bzrlib/tests/http_utils.py => bzrlib/selftest/HTTPTestUtil.py
- bzrlib/tests/blackbox/test_too_much.py => bzrlib/selftest/blackbox.py
- bzrlib/tests/test_plugins.py => bzrlib/selftest/plugins.py
- bzrlib/tests/per_branch/test_parent.py => bzrlib/selftest/test_parent.py
- bzrlib/tests/blackbox/test_revision_info.py => bzrlib/selftest/test_revision_info.py
- bzrlib/tests/per_branch/test_branch.py => bzrlib/selftest/testbranch.py
- bzrlib/tests/test_diff.py => bzrlib/selftest/testdiff.py
- bzrlib/tests/test_fetch.py => bzrlib/selftest/testfetch.py
- bzrlib/tests/test_hashcache.py => bzrlib/selftest/testhashcache.py
- bzrlib/tests/test_inv.py => bzrlib/selftest/testinv.py
- bzrlib/tests/test_log.py => bzrlib/selftest/testlog.py
- bzrlib/tests/test_merge.py => bzrlib/selftest/testmerge.py
- bzrlib/tests/test_merge3.py => bzrlib/selftest/testmerge3.py
- bzrlib/tests/test_revision.py => bzrlib/selftest/testrevision.py
- bzrlib/tests/test_revisionspec.py => bzrlib/selftest/testrevisionnamespaces.py
- bzrlib/tests/blackbox/test_status.py => bzrlib/selftest/teststatus.py
- bzrlib/tests/test_store.py => bzrlib/selftest/teststore.py
- bzrlib/tests/test_transport.py => bzrlib/selftest/testtransport.py
- bzrlib/tests/test_workingtree.py => bzrlib/selftest/testworkingtree.py
- bzrlib/tests/blackbox/test_versioning.py => bzrlib/selftest/versioning.py
- bzrlib/tests/test_whitebox.py => bzrlib/selftest/whitebox.py
- bzrlib/store/versioned/__init__.py => bzrlib/store/weave.py
- bzrlib/transport/http/__init__.py => bzrlib/transport/http.py
- bzrlib/ui/__init__.py => bzrlib/ui.py
- bzrlib/xml_serializer.py => bzrlib/xml.py
- bzrlib/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- bzrlib/xml8.py => bzrlib/xml5.py
- doc/en/tutorials/tutorial.txt => tutorial.txt
- files modified:
- .bzrignore
- bzr *
- setup.py *
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
