← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4597.3.69.

Committer: Vincent Ladeuil
Date: 2010-02-03 07:16:21 UTC
mfrom: (4597.6.4 description)
mto: (5008.1.1 integration)
mto: This revision was merged to the branch mainline in revision 5009.
Revision ID: v.ladeuil+lp@free.fr-20100203071621-1bzqu19rk3nyple2

Merge description into dont-add-conflict-helpers

files added:
bzrlib/plugins/news_merge

bzrlib/plugins/news_merge/README

bzrlib/plugins/news_merge/__init__.py

bzrlib/plugins/news_merge/news_merge.py

bzrlib/plugins/news_merge/parser.py

bzrlib/plugins/news_merge/tests

bzrlib/plugins/news_merge/tests/__init__.py

bzrlib/plugins/news_merge/tests/test_news_merge.py

files removed:
contrib/fortune

tools/biobench.py

tools/history2revfiles.py

files modified:
INSTALL

Makefile

NEWS

README

bzr

bzrlib/__init__.py

bzrlib/benchmarks/bench_knit.py

bzrlib/builtins.py

bzrlib/bzrdir.py

bzrlib/chk_map.py

bzrlib/decorators.py

bzrlib/diff.py

bzrlib/doc_generate/autodoc_man.py

bzrlib/errors.py

bzrlib/export/dir_exporter.py

bzrlib/fetch.py

bzrlib/foreign.py

bzrlib/globbing.py

bzrlib/help_topics/__init__.py

bzrlib/help_topics/en/patterns.txt

bzrlib/hooks.py

bzrlib/log.py

bzrlib/merge.py

bzrlib/plugins/launchpad/lp_registration.py

bzrlib/plugins/launchpad/test_lp_api.py

bzrlib/plugins/launchpad/test_lp_directory.py

bzrlib/remote.py

bzrlib/repofmt/groupcompress_repo.py

bzrlib/repofmt/pack_repo.py

bzrlib/repository.py

bzrlib/revisiontree.py

bzrlib/smart/client.py

bzrlib/smart/medium.py

bzrlib/tests/__init__.py

bzrlib/tests/blackbox/test_commit.py

bzrlib/tests/blackbox/test_info.py

bzrlib/tests/blackbox/test_log.py

bzrlib/tests/blackbox/test_non_ascii.py

bzrlib/tests/blackbox/test_outside_wt.py

bzrlib/tests/blackbox/test_pull.py

bzrlib/tests/blackbox/test_re_sign.py

bzrlib/tests/blackbox/test_reconcile.py

bzrlib/tests/blackbox/test_sign_my_commits.py

bzrlib/tests/blackbox/test_upgrade.py

bzrlib/tests/commands/test_cat.py

bzrlib/tests/per_branch/test_break_lock.py

bzrlib/tests/per_branch/test_push.py

bzrlib/tests/per_bzrdir/test_bzrdir.py

bzrlib/tests/per_interbranch/test_push.py

bzrlib/tests/per_interrepository/test_fetch.py

bzrlib/tests/per_merger.py

bzrlib/tests/per_pack_repository.py

bzrlib/tests/per_repository/test_break_lock.py

bzrlib/tests/per_repository_reference/test_break_lock.py

bzrlib/tests/per_versionedfile.py

bzrlib/tests/per_workingtree/test_break_lock.py

bzrlib/tests/per_workingtree/test_commit.py

bzrlib/tests/per_workingtree/test_content_filters.py

bzrlib/tests/per_workingtree/test_eol_conversion.py

bzrlib/tests/per_workingtree/test_is_ignored.py

bzrlib/tests/per_workingtree/test_readonly.py

bzrlib/tests/test__dirstate_helpers.py

bzrlib/tests/test_btree_index.py

bzrlib/tests/test_bugtracker.py

bzrlib/tests/test_bundle.py

bzrlib/tests/test_chk_map.py

bzrlib/tests/test_config.py

bzrlib/tests/test_directory_service.py

bzrlib/tests/test_dirstate.py

bzrlib/tests/test_errors.py

bzrlib/tests/test_export.py

bzrlib/tests/test_fetch.py

bzrlib/tests/test_globbing.py

bzrlib/tests/test_http.py

bzrlib/tests/test_ignores.py

bzrlib/tests/test_info.py

bzrlib/tests/test_knit.py

bzrlib/tests/test_lazy_import.py

bzrlib/tests/test_log.py

bzrlib/tests/test_merge.py

bzrlib/tests/test_msgeditor.py

bzrlib/tests/test_osutils.py

bzrlib/tests/test_osutils_encodings.py

bzrlib/tests/test_plugins.py

bzrlib/tests/test_remote.py

bzrlib/tests/test_repository.py

bzrlib/tests/test_revisiontree.py

bzrlib/tests/test_selftest.py

bzrlib/tests/test_sftp_transport.py

bzrlib/tests/test_trace.py

bzrlib/tests/test_transform.py

bzrlib/tests/test_version_info.py

bzrlib/tests/test_win32utils.py

bzrlib/tests/test_workingtree_4.py

bzrlib/tests/transport_util.py

bzrlib/version.py

bzrlib/workingtree.py

bzrlib/workingtree_4.py

doc/developers/HACKING.txt

doc/developers/_templates/layout.html

doc/developers/win32_build_setup.txt

doc/en/_static/en/bzr-en-quick-reference.svg

doc/en/_templates/index.html

doc/en/_templates/layout.html

doc/en/user-guide/introducing_bazaar.txt

doc/es/_static/es/bzr-es-quick-reference.svg

doc/es/_templates/layout.html

doc/ru/_static/ru/bzr-ru-quick-reference.svg

doc/ru/_templates/layout.html

setup.py

tools/win32/bzr_postinstall.py

Show diffs side-by-side

added added

removed removed

bzrlib/__init__.py

bzrlib/benchmarks/bench_knit.py

bzrlib/builtins.py

bzrlib/bzrdir.py

bzrlib/chk_map.py

bzrlib/decorators.py

bzrlib/doc_generate/autodoc_man.py

bzrlib/errors.py

bzrlib/export/dir_exporter.py

bzrlib/fetch.py

bzrlib/foreign.py

bzrlib/globbing.py

bzrlib/help_topics/__init__.py

bzrlib/help_topics/en/patterns.txt

bzrlib/hooks.py

bzrlib/merge.py

bzrlib/plugins/launchpad/lp_registration.py

bzrlib/plugins/launchpad/test_lp_api.py

bzrlib/plugins/launchpad/test_lp_directory.py

bzrlib/plugins/news_merge/

bzrlib/plugins/news_merge/README

bzrlib/plugins/news_merge/__init__.py

bzrlib/plugins/news_merge/news_merge.py

bzrlib/plugins/news_merge/parser.py

bzrlib/plugins/news_merge/tests/

bzrlib/plugins/news_merge/tests/__init__.py

bzrlib/plugins/news_merge/tests/test_news_merge.py

bzrlib/remote.py

bzrlib/repofmt/groupcompress_repo.py

bzrlib/repofmt/pack_repo.py

bzrlib/repository.py

bzrlib/revisiontree.py

bzrlib/smart/client.py

bzrlib/smart/medium.py

bzrlib/tests/__init__.py

bzrlib/tests/blackbox/test_commit.py

bzrlib/tests/blackbox/test_info.py

bzrlib/tests/blackbox/test_log.py

bzrlib/tests/blackbox/test_non_ascii.py

bzrlib/tests/blackbox/test_outside_wt.py

bzrlib/tests/blackbox/test_pull.py

bzrlib/tests/blackbox/test_re_sign.py

bzrlib/tests/blackbox/test_reconcile.py

bzrlib/tests/blackbox/test_sign_my_commits.py

bzrlib/tests/blackbox/test_upgrade.py

bzrlib/tests/commands/test_cat.py

bzrlib/tests/per_branch/test_break_lock.py

bzrlib/tests/per_branch/test_push.py

bzrlib/tests/per_bzrdir/test_bzrdir.py

bzrlib/tests/per_interbranch/test_push.py

bzrlib/tests/per_interrepository/test_fetch.py

bzrlib/tests/per_merger.py

bzrlib/tests/per_pack_repository.py

bzrlib/tests/per_repository/test_break_lock.py

bzrlib/tests/per_repository_reference/test_break_lock.py

bzrlib/tests/per_versionedfile.py

bzrlib/tests/per_workingtree/test_break_lock.py

bzrlib/tests/per_workingtree/test_commit.py

bzrlib/tests/per_workingtree/test_content_filters.py

bzrlib/tests/per_workingtree/test_eol_conversion.py

bzrlib/tests/per_workingtree/test_is_ignored.py

bzrlib/tests/per_workingtree/test_readonly.py

bzrlib/tests/test__dirstate_helpers.py

bzrlib/tests/test_btree_index.py

bzrlib/tests/test_bugtracker.py

bzrlib/tests/test_bundle.py

bzrlib/tests/test_chk_map.py

bzrlib/tests/test_config.py

bzrlib/tests/test_directory_service.py

bzrlib/tests/test_dirstate.py

bzrlib/tests/test_errors.py

bzrlib/tests/test_export.py

bzrlib/tests/test_fetch.py

bzrlib/tests/test_globbing.py

bzrlib/tests/test_http.py

bzrlib/tests/test_ignores.py

bzrlib/tests/test_info.py

bzrlib/tests/test_knit.py

bzrlib/tests/test_lazy_import.py

bzrlib/tests/test_log.py

bzrlib/tests/test_merge.py

bzrlib/tests/test_msgeditor.py

bzrlib/tests/test_osutils.py

bzrlib/tests/test_osutils_encodings.py

bzrlib/tests/test_plugins.py

bzrlib/tests/test_remote.py

bzrlib/tests/test_repository.py

bzrlib/tests/test_revisiontree.py

bzrlib/tests/test_selftest.py

bzrlib/tests/test_sftp_transport.py

bzrlib/tests/test_trace.py

bzrlib/tests/test_transform.py

bzrlib/tests/test_version_info.py

bzrlib/tests/test_win32utils.py

bzrlib/tests/test_workingtree_4.py

bzrlib/tests/transport_util.py

bzrlib/version.py

bzrlib/workingtree.py

bzrlib/workingtree_4.py

contrib/fortune

doc/developers/HACKING.txt

doc/developers/_templates/layout.html

doc/developers/win32_build_setup.txt

doc/en/_static/en/bzr-en-quick-reference.svg

doc/en/_templates/index.html

doc/en/_templates/layout.html

doc/en/user-guide/introducing_bazaar.txt

doc/es/_static/es/bzr-es-quick-reference.svg

doc/es/_templates/layout.html

doc/ru/_static/ru/bzr-ru-quick-reference.svg

doc/ru/_templates/layout.html

tools/biobench.py

tools/history2revfiles.py

tools/win32/bzr_postinstall.py

Older »