lp:~abentley/bzr/unbreak-merge
Created by
Aaron Bentley
and last modified
Only
Aaron Bentley
can upload to this branch. If you are
Aaron Bentley
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Rejected
for merging
into
lp:bzr/2.0
- John A Meinel: Needs Fixing
-
Diff: 54390 lines (+23989/-8597)483 files modified.bzrignore (+3/-0)
Makefile (+10/-19)
NEWS (+993/-13)
bzr (+1/-1)
bzrlib/__init__.py (+3/-8)
bzrlib/_annotator_pyx.pyx (+1/-1)
bzrlib/_bencode_pyx.pyx (+10/-2)
bzrlib/_btree_serializer_py.py (+14/-8)
bzrlib/_btree_serializer_pyx.pyx (+88/-44)
bzrlib/_chk_map_py.py (+5/-4)
bzrlib/_chk_map_pyx.pyx (+42/-19)
bzrlib/_dirstate_helpers_pyx.pyx (+1/-1)
bzrlib/_export_c_api.h (+104/-0)
bzrlib/_groupcompress_pyx.pyx (+68/-51)
bzrlib/_import_c_api.h (+189/-0)
bzrlib/_knit_load_data_pyx.pyx (+1/-1)
bzrlib/_known_graph_py.py (+91/-2)
bzrlib/_known_graph_pyx.pyx (+132/-20)
bzrlib/_patiencediff_c.c (+2/-2)
bzrlib/_readdir_pyx.pyx (+1/-1)
bzrlib/_rio_pyx.pyx (+1/-1)
bzrlib/_simple_set_pyx.pxd (+91/-0)
bzrlib/_simple_set_pyx.pyx (+592/-0)
bzrlib/_static_tuple_c.c (+945/-0)
bzrlib/_static_tuple_c.h (+116/-0)
bzrlib/_static_tuple_c.pxd (+44/-0)
bzrlib/_static_tuple_py.py (+80/-0)
bzrlib/_walkdirs_win32.pyx (+1/-1)
bzrlib/annotate.py (+2/-1)
bzrlib/benchmarks/bench_dirstate.py (+7/-7)
bzrlib/bencode.py (+4/-1)
bzrlib/branch.py (+30/-17)
bzrlib/btree_index.py (+50/-17)
bzrlib/bugtracker.py (+20/-17)
bzrlib/builtins.py (+974/-864)
bzrlib/bundle/__init__.py (+26/-29)
bzrlib/bundle/apply_bundle.py (+2/-1)
bzrlib/bzrdir.py (+69/-22)
bzrlib/check.py (+7/-7)
bzrlib/chk_map.py (+147/-36)
bzrlib/chk_serializer.py (+4/-3)
bzrlib/cleanup.py (+186/-0)
bzrlib/cmd_version_info.py (+6/-3)
bzrlib/commands.py (+58/-37)
bzrlib/commit.py (+138/-149)
bzrlib/config.py (+43/-3)
bzrlib/conflicts.py (+8/-10)
bzrlib/decorators.py (+105/-1)
bzrlib/delta.py (+2/-2)
bzrlib/diff.py (+70/-20)
bzrlib/dirstate.py (+6/-5)
bzrlib/doc_generate/autodoc_man.py (+2/-2)
bzrlib/doc_generate/autodoc_rstx.py (+43/-59)
bzrlib/errors.py (+56/-7)
bzrlib/export/dir_exporter.py (+1/-1)
bzrlib/export/zip_exporter.py (+3/-2)
bzrlib/fetch.py (+19/-6)
bzrlib/foreign.py (+51/-13)
bzrlib/globbing.py (+41/-4)
bzrlib/graph.py (+17/-2)
bzrlib/groupcompress.py (+63/-48)
bzrlib/help.py (+6/-2)
bzrlib/help_topics/__init__.py (+66/-27)
bzrlib/help_topics/en/authentication.txt (+2/-4)
bzrlib/help_topics/en/configuration.txt (+74/-1)
bzrlib/help_topics/en/conflict-types.txt (+26/-3)
bzrlib/help_topics/en/content-filters.txt (+2/-2)
bzrlib/help_topics/en/debug-flags.txt (+8/-3)
bzrlib/help_topics/en/log-formats.txt (+1/-1)
bzrlib/help_topics/en/patterns.txt (+3/-0)
bzrlib/help_topics/en/rules.txt (+9/-6)
bzrlib/help_topics/es/conflicts.txt (+43/-43)
bzrlib/hooks.py (+4/-2)
bzrlib/index.py (+57/-23)
bzrlib/info.py (+2/-1)
bzrlib/inventory.py (+66/-51)
bzrlib/knit.py (+12/-5)
bzrlib/lock.py (+21/-0)
bzrlib/lockable_files.py (+2/-2)
bzrlib/lockdir.py (+23/-16)
bzrlib/log.py (+112/-52)
bzrlib/lsprof.py (+55/-26)
bzrlib/mail_client.py (+66/-0)
bzrlib/merge.py (+462/-276)
bzrlib/merge_directive.py (+6/-8)
bzrlib/msgeditor.py (+9/-11)
bzrlib/mutabletree.py (+41/-34)
bzrlib/option.py (+15/-19)
bzrlib/osutils.py (+235/-27)
bzrlib/patches.py (+1/-1)
bzrlib/plugin.py (+90/-26)
bzrlib/plugins/launchpad/__init__.py (+45/-33)
bzrlib/plugins/launchpad/lp_api.py (+135/-0)
bzrlib/plugins/launchpad/lp_directory.py (+3/-9)
bzrlib/plugins/launchpad/lp_registration.py (+54/-18)
bzrlib/plugins/launchpad/test_lp_api.py (+101/-0)
bzrlib/plugins/launchpad/test_lp_directory.py (+145/-2)
bzrlib/plugins/launchpad/test_lp_open.py (+16/-4)
bzrlib/plugins/news_merge/README (+7/-0)
bzrlib/plugins/news_merge/__init__.py (+66/-0)
bzrlib/plugins/news_merge/news_merge.py (+94/-0)
bzrlib/plugins/news_merge/parser.py (+62/-0)
bzrlib/plugins/news_merge/tests/__init__.py (+23/-0)
bzrlib/plugins/news_merge/tests/test_news_merge.py (+29/-0)
bzrlib/progress.py (+15/-3)
bzrlib/push.py (+5/-1)
bzrlib/python-compat.h (+11/-0)
bzrlib/reconcile.py (+50/-51)
bzrlib/reconfigure.py (+1/-3)
bzrlib/registry.py (+4/-1)
bzrlib/remote.py (+98/-26)
bzrlib/repofmt/groupcompress_repo.py (+24/-9)
bzrlib/repofmt/pack_repo.py (+104/-56)
bzrlib/repofmt/weaverepo.py (+1/-1)
bzrlib/repository.py (+65/-30)
bzrlib/revision.py (+6/-3)
bzrlib/revisionspec.py (+81/-22)
bzrlib/revisiontree.py (+5/-2)
bzrlib/rio.py (+3/-1)
bzrlib/send.py (+2/-3)
bzrlib/serializer.py (+6/-2)
bzrlib/shelf_ui.py (+120/-27)
bzrlib/shellcomplete.py (+1/-1)
bzrlib/smart/branch.py (+2/-2)
bzrlib/smart/bzrdir.py (+67/-8)
bzrlib/smart/client.py (+4/-1)
bzrlib/smart/medium.py (+19/-7)
bzrlib/smart/message.py (+1/-1)
bzrlib/smart/protocol.py (+81/-17)
bzrlib/smart/repository.py (+1/-1)
bzrlib/smart/request.py (+65/-16)
bzrlib/smart/server.py (+139/-33)
bzrlib/smart/vfs.py (+10/-1)
bzrlib/static_tuple.py (+56/-0)
bzrlib/status.py (+17/-11)
bzrlib/switch.py (+9/-6)
bzrlib/tests/TestUtil.py (+13/-1)
bzrlib/tests/__init__.py (+932/-662)
bzrlib/tests/blackbox/test_add.py (+1/-16)
bzrlib/tests/blackbox/test_annotate.py (+1/-1)
bzrlib/tests/blackbox/test_bound_branches.py (+6/-12)
bzrlib/tests/blackbox/test_branch.py (+9/-10)
bzrlib/tests/blackbox/test_breakin.py (+20/-23)
bzrlib/tests/blackbox/test_cat.py (+22/-11)
bzrlib/tests/blackbox/test_checkout.py (+2/-10)
bzrlib/tests/blackbox/test_commit.py (+51/-5)
bzrlib/tests/blackbox/test_debug.py (+2/-3)
bzrlib/tests/blackbox/test_diff.py (+7/-7)
bzrlib/tests/blackbox/test_dpush.py (+105/-44)
bzrlib/tests/blackbox/test_exceptions.py (+67/-13)
bzrlib/tests/blackbox/test_export.py (+2/-2)
bzrlib/tests/blackbox/test_filesystem_cicp.py (+9/-2)
bzrlib/tests/blackbox/test_filtered_view_ops.py (+22/-21)
bzrlib/tests/blackbox/test_help.py (+18/-3)
bzrlib/tests/blackbox/test_ignore.py (+1/-2)
bzrlib/tests/blackbox/test_info.py (+9/-7)
bzrlib/tests/blackbox/test_init.py (+4/-3)
bzrlib/tests/blackbox/test_locale.py (+9/-6)
bzrlib/tests/blackbox/test_log.py (+16/-1)
bzrlib/tests/blackbox/test_ls.py (+2/-1)
bzrlib/tests/blackbox/test_merge.py (+98/-42)
bzrlib/tests/blackbox/test_mv.py (+10/-2)
bzrlib/tests/blackbox/test_non_ascii.py (+7/-7)
bzrlib/tests/blackbox/test_outside_wt.py (+33/-31)
bzrlib/tests/blackbox/test_pull.py (+1/-1)
bzrlib/tests/blackbox/test_push.py (+50/-7)
bzrlib/tests/blackbox/test_remerge.py (+2/-2)
bzrlib/tests/blackbox/test_remove.py (+9/-7)
bzrlib/tests/blackbox/test_remove_tree.py (+27/-0)
bzrlib/tests/blackbox/test_selftest.py (+13/-16)
bzrlib/tests/blackbox/test_send.py (+6/-9)
bzrlib/tests/blackbox/test_serve.py (+154/-137)
bzrlib/tests/blackbox/test_shared_repository.py (+21/-3)
bzrlib/tests/blackbox/test_shelve.py (+24/-1)
bzrlib/tests/blackbox/test_split.py (+1/-1)
bzrlib/tests/blackbox/test_switch.py (+43/-1)
bzrlib/tests/blackbox/test_too_much.py (+8/-25)
bzrlib/tests/blackbox/test_uncommit.py (+2/-2)
bzrlib/tests/blackbox/test_update.py (+141/-35)
bzrlib/tests/blackbox/test_version.py (+20/-0)
bzrlib/tests/commands/test_branch.py (+4/-4)
bzrlib/tests/commands/test_cat.py (+2/-2)
bzrlib/tests/commands/test_checkout.py (+3/-3)
bzrlib/tests/commands/test_commit.py (+2/-2)
bzrlib/tests/commands/test_init.py (+2/-2)
bzrlib/tests/commands/test_init_repository.py (+2/-2)
bzrlib/tests/commands/test_merge.py (+2/-2)
bzrlib/tests/commands/test_missing.py (+2/-2)
bzrlib/tests/commands/test_pull.py (+3/-3)
bzrlib/tests/commands/test_push.py (+3/-3)
bzrlib/tests/commands/test_update.py (+5/-2)
bzrlib/tests/features.py (+11/-19)
bzrlib/tests/ftp_server/__init__.py (+3/-3)
bzrlib/tests/ftp_server/medusa_based.py (+5/-4)
bzrlib/tests/ftp_server/pyftpdlib_based.py (+16/-12)
bzrlib/tests/http_server.py (+18/-16)
bzrlib/tests/http_utils.py (+4/-5)
bzrlib/tests/lock_helpers.py (+2/-0)
bzrlib/tests/per_branch/test_hooks.py (+3/-7)
bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.py (+23/-1)
bzrlib/tests/per_branch/test_locking.py (+2/-2)
bzrlib/tests/per_branch/test_parent.py (+3/-3)
bzrlib/tests/per_branch/test_permissions.py (+4/-4)
bzrlib/tests/per_branch/test_push.py (+4/-5)
bzrlib/tests/per_bzrdir/test_bzrdir.py (+42/-14)
bzrlib/tests/per_foreign_vcs/__init__.py (+50/-0)
bzrlib/tests/per_foreign_vcs/test_branch.py (+151/-0)
bzrlib/tests/per_foreign_vcs/test_repository.py (+88/-0)
bzrlib/tests/per_interbranch/test_push.py (+1/-2)
bzrlib/tests/per_intertree/__init__.py (+3/-2)
bzrlib/tests/per_merger.py (+403/-0)
bzrlib/tests/per_pack_repository.py (+6/-8)
bzrlib/tests/per_repository/test_check.py (+6/-9)
bzrlib/tests/per_repository/test_check_reconcile.py (+3/-4)
bzrlib/tests/per_repository/test_commit_builder.py (+7/-1)
bzrlib/tests/per_repository/test_repository.py (+10/-17)
bzrlib/tests/per_repository/test_write_group.py (+1/-1)
bzrlib/tests/per_repository_reference/test_check.py (+2/-3)
bzrlib/tests/per_transport.py (+6/-2)
bzrlib/tests/per_tree/test_get_file_with_stat.py (+4/-2)
bzrlib/tests/per_tree/test_inv.py (+1/-1)
bzrlib/tests/per_tree/test_iter_search_rules.py (+1/-2)
bzrlib/tests/per_tree/test_path_content_summary.py (+28/-5)
bzrlib/tests/per_uifactory/__init__.py (+251/-0)
bzrlib/tests/per_versionedfile.py (+5/-1)
bzrlib/tests/per_workingtree/test_content_filters.py (+1/-1)
bzrlib/tests/per_workingtree/test_flush.py (+9/-1)
bzrlib/tests/per_workingtree/test_is_ignored.py (+16/-1)
bzrlib/tests/per_workingtree/test_locking.py (+11/-2)
bzrlib/tests/per_workingtree/test_set_root_id.py (+5/-0)
bzrlib/tests/per_workingtree/test_smart_add.py (+8/-2)
bzrlib/tests/per_workingtree/test_workingtree.py (+37/-16)
bzrlib/tests/script.py (+477/-0)
bzrlib/tests/ssl_certs/create_ssls.py (+8/-1)
bzrlib/tests/ssl_certs/server.crt (+26/-26)
bzrlib/tests/ssl_certs/server.csr (+23/-23)
bzrlib/tests/ssl_certs/server_with_pass.key (+50/-50)
bzrlib/tests/ssl_certs/server_without_pass.key (+49/-49)
bzrlib/tests/stub_sftp.py (+379/-46)
bzrlib/tests/test__annotator.py (+4/-31)
bzrlib/tests/test__bencode.py (+16/-43)
bzrlib/tests/test__chk_map.py (+25/-46)
bzrlib/tests/test__chunks_to_lines.py (+11/-29)
bzrlib/tests/test__dirstate_helpers.py (+28/-30)
bzrlib/tests/test__groupcompress.py (+12/-26)
bzrlib/tests/test__known_graph.py (+105/-25)
bzrlib/tests/test__rio.py (+3/-30)
bzrlib/tests/test__simple_set.py (+381/-0)
bzrlib/tests/test__static_tuple.py (+648/-0)
bzrlib/tests/test__walkdirs_win32.py (+3/-16)
bzrlib/tests/test_branch.py (+17/-0)
bzrlib/tests/test_btree_index.py (+39/-39)
bzrlib/tests/test_bundle.py (+5/-8)
bzrlib/tests/test_bzrdir.py (+14/-6)
bzrlib/tests/test_chk_map.py (+50/-77)
bzrlib/tests/test_cleanup.py (+278/-0)
bzrlib/tests/test_commit.py (+2/-2)
bzrlib/tests/test_config.py (+80/-13)
bzrlib/tests/test_conflicts.py (+92/-92)
bzrlib/tests/test_crash.py (+17/-26)
bzrlib/tests/test_decorators.py (+33/-10)
bzrlib/tests/test_diff.py (+72/-31)
bzrlib/tests/test_directory_service.py (+12/-6)
bzrlib/tests/test_errors.py (+39/-2)
bzrlib/tests/test_foreign.py (+45/-41)
bzrlib/tests/test_globbing.py (+54/-1)
bzrlib/tests/test_graph.py (+19/-1)
bzrlib/tests/test_groupcompress.py (+132/-28)
bzrlib/tests/test_hooks.py (+13/-13)
bzrlib/tests/test_http.py (+247/-117)
bzrlib/tests/test_http_response.py (+2/-3)
bzrlib/tests/test_ignores.py (+5/-1)
bzrlib/tests/test_index.py (+37/-2)
bzrlib/tests/test_info.py (+13/-17)
bzrlib/tests/test_knit.py (+5/-15)
bzrlib/tests/test_lockable_files.py (+3/-3)
bzrlib/tests/test_lockdir.py (+7/-10)
bzrlib/tests/test_log.py (+321/-414)
bzrlib/tests/test_lsprof.py (+19/-0)
bzrlib/tests/test_mail_client.py (+4/-0)
bzrlib/tests/test_merge.py (+209/-162)
bzrlib/tests/test_merge_core.py (+75/-32)
bzrlib/tests/test_msgeditor.py (+28/-3)
bzrlib/tests/test_mutabletree.py (+30/-9)
bzrlib/tests/test_osutils.py (+196/-33)
bzrlib/tests/test_patches.py (+1/-1)
bzrlib/tests/test_permissions.py (+4/-4)
bzrlib/tests/test_plugins.py (+133/-65)
bzrlib/tests/test_progress.py (+14/-1)
bzrlib/tests/test_reconfigure.py (+14/-1)
bzrlib/tests/test_registry.py (+63/-6)
bzrlib/tests/test_remote.py (+109/-24)
bzrlib/tests/test_repository.py (+170/-7)
bzrlib/tests/test_revisionspec.py (+44/-19)
bzrlib/tests/test_revisiontree.py (+9/-1)
bzrlib/tests/test_script.py (+449/-0)
bzrlib/tests/test_selftest.py (+380/-299)
bzrlib/tests/test_sftp_transport.py (+29/-47)
bzrlib/tests/test_shelf.py (+6/-0)
bzrlib/tests/test_shelf_ui.py (+116/-10)
bzrlib/tests/test_smart.py (+206/-33)
bzrlib/tests/test_smart_transport.py (+38/-29)
bzrlib/tests/test_source.py (+13/-5)
bzrlib/tests/test_ssh_transport.py (+20/-1)
bzrlib/tests/test_status.py (+1/-1)
bzrlib/tests/test_switch.py (+17/-0)
bzrlib/tests/test_trace.py (+27/-17)
bzrlib/tests/test_transform.py (+103/-11)
bzrlib/tests/test_transport.py (+275/-81)
bzrlib/tests/test_transport_log.py (+4/-5)
bzrlib/tests/test_ui.py (+165/-132)
bzrlib/tests/test_urlutils.py (+6/-2)
bzrlib/tests/test_version.py (+16/-2)
bzrlib/tests/test_win32utils.py (+170/-37)
bzrlib/tests/test_wsgi.py (+55/-7)
bzrlib/tests/test_xml.py (+34/-1)
bzrlib/tests/transport_util.py (+15/-3)
bzrlib/textui.py (+0/-40)
bzrlib/trace.py (+43/-30)
bzrlib/transform.py (+32/-6)
bzrlib/transport/__init__.py (+9/-7)
bzrlib/transport/chroot.py (+22/-112)
bzrlib/transport/decorator.py (+6/-7)
bzrlib/transport/ftp/__init__.py (+22/-34)
bzrlib/transport/ftp/_gssapi.py (+11/-41)
bzrlib/transport/http/__init__.py (+2/-2)
bzrlib/transport/http/_urllib.py (+3/-3)
bzrlib/transport/http/_urllib2_wrappers.py (+37/-12)
bzrlib/transport/http/wsgi.py (+5/-4)
bzrlib/transport/local.py (+3/-6)
bzrlib/transport/memory.py (+10/-7)
bzrlib/transport/pathfilter.py (+195/-0)
bzrlib/transport/sftp.py (+5/-328)
bzrlib/transport/ssh.py (+50/-25)
bzrlib/tree.py (+7/-4)
bzrlib/ui/__init__.py (+118/-101)
bzrlib/ui/text.py (+163/-26)
bzrlib/upgrade.py (+5/-4)
bzrlib/urlutils.py (+10/-4)
bzrlib/util/_bencode_py.py (+9/-0)
bzrlib/version.py (+6/-3)
bzrlib/version_info_formats/format_rio.py (+2/-1)
bzrlib/versionedfile.py (+63/-2)
bzrlib/win32utils.py (+151/-30)
bzrlib/workingtree.py (+56/-26)
bzrlib/workingtree_4.py (+13/-23)
bzrlib/xml4.py (+6/-4)
bzrlib/xml5.py (+5/-3)
bzrlib/xml7.py (+4/-3)
bzrlib/xml8.py (+10/-7)
bzrlib/xml_serializer.py (+8/-3)
contrib/debian/default (+20/-0)
contrib/debian/init.d (+135/-0)
doc/default.css (+4/-4)
doc/developers/HACKING.txt (+74/-60)
doc/developers/_static/bzr-doc.css (+4/-0)
doc/developers/_templates/layout.html (+5/-0)
doc/developers/add.txt (+1/-1)
doc/developers/api-versioning.txt (+2/-2)
doc/developers/apport.txt (+2/-2)
doc/developers/authentication-ring.txt (+6/-6)
doc/developers/bug-handling.txt (+62/-44)
doc/developers/bundles.txt (+1/-1)
doc/developers/case-insensitive-file-systems.txt (+1/-1)
doc/developers/colocated-branches.txt (+9/-9)
doc/developers/commit.txt (+19/-19)
doc/developers/container-format.txt (+5/-5)
doc/developers/content-filtering.txt (+1/-1)
doc/developers/contribution-quickstart.txt (+59/-0)
doc/developers/cycle.txt (+56/-58)
doc/developers/development-repo.txt (+2/-2)
doc/developers/diff.txt (+1/-1)
doc/developers/directory-fingerprints.txt (+33/-33)
doc/developers/ec2.txt (+16/-16)
doc/developers/improved_chk_index.txt (+6/-6)
doc/developers/incremental-push-pull.txt (+5/-5)
doc/developers/index-plain.txt (+9/-9)
doc/developers/index.txt (+13/-2)
doc/developers/integration.txt (+2/-2)
doc/developers/inventory.txt (+10/-10)
doc/developers/last-modified.txt (+6/-6)
doc/developers/network-protocol.txt (+18/-16)
doc/developers/overview.txt (+5/-5)
doc/developers/performance-use-case-analysis.txt (+5/-5)
doc/developers/planned-change-integration.txt (+5/-5)
doc/developers/planned-performance-changes.txt (+1/-1)
doc/developers/plans.txt (+1/-1)
doc/developers/plugin-api.txt (+6/-6)
doc/developers/ppa.txt (+59/-33)
doc/developers/principles.txt (+62/-0)
doc/developers/process.txt (+5/-5)
doc/developers/profiling.txt (+1/-1)
doc/developers/releasing.txt (+103/-56)
doc/developers/repository-stream.txt (+1/-1)
doc/developers/repository.txt (+8/-8)
doc/developers/revert.txt (+1/-1)
doc/developers/specifications.txt (+1/-1)
doc/developers/status.txt (+2/-2)
doc/developers/testing.txt (+147/-16)
doc/developers/tortoise-strategy.txt (+9/-9)
doc/developers/update.txt (+5/-5)
doc/developers/win32_build_setup.txt (+213/-0)
doc/en/_templates/index.html (+9/-5)
doc/en/admin-guide/advanced.txt (+164/-0)
doc/en/admin-guide/backup.txt (+204/-0)
doc/en/admin-guide/code-browsing.txt (+128/-0)
doc/en/admin-guide/hooks-plugins.txt (+310/-0)
doc/en/admin-guide/index-plain.txt (+23/-0)
doc/en/admin-guide/index.txt (+25/-114)
doc/en/admin-guide/integration.txt (+14/-0)
doc/en/admin-guide/introduction.txt (+55/-0)
doc/en/admin-guide/migration.txt (+73/-0)
doc/en/admin-guide/other-setups.txt (+60/-0)
doc/en/admin-guide/security.txt (+116/-0)
doc/en/admin-guide/simple-setups.txt (+93/-0)
doc/en/admin-guide/upgrade.txt (+77/-0)
doc/en/conf.py (+1/-2)
doc/en/index.txt (+1/-0)
doc/en/mini-tutorial/index.txt (+35/-33)
doc/en/tutorials/centralized_workflow.txt (+6/-6)
doc/en/tutorials/tutorial.txt (+78/-34)
doc/en/tutorials/using_bazaar_with_launchpad.txt (+1/-1)
doc/en/user-guide/adv_merging.txt (+23/-0)
doc/en/user-guide/branching_a_project.txt (+6/-6)
doc/en/user-guide/bug_trackers.txt (+1/-1)
doc/en/user-guide/configuring_bazaar.txt (+1/-1)
doc/en/user-guide/controlling_registration.txt (+1/-1)
doc/en/user-guide/distributed_intro.txt (+1/-1)
doc/en/user-guide/getting_help.txt (+9/-7)
doc/en/user-guide/hooks.txt (+6/-4)
doc/en/user-guide/http_smart_server.txt (+8/-8)
doc/en/user-guide/index-plain.txt (+1/-1)
doc/en/user-guide/index.txt (+1/-1)
doc/en/user-guide/introducing_bazaar.txt (+3/-3)
doc/en/user-guide/plugins.txt (+9/-21)
doc/en/user-guide/publishing_a_branch.txt (+0/-1)
doc/en/user-guide/recording_changes.txt (+1/-1)
doc/en/user-guide/resolving_conflicts.txt (+1/-1)
doc/en/user-guide/reviewing_changes.txt (+10/-2)
doc/en/user-guide/sending_changes.txt (+2/-2)
doc/en/user-guide/server.txt (+17/-7)
doc/en/user-guide/setting_up_email.txt (+2/-2)
doc/en/user-guide/shared_repository_layouts.txt (+22/-22)
doc/en/user-guide/shelving_changes.txt (+6/-6)
doc/en/user-guide/specifying_revisions.txt (+12/-6)
doc/en/user-guide/stacked.txt (+1/-1)
doc/en/user-guide/svn_plugin.txt (+3/-5)
doc/en/user-guide/undoing_mistakes.txt (+1/-1)
doc/en/user-guide/version_info.txt (+1/-1)
doc/en/user-guide/web_browsing.txt (+2/-2)
doc/en/user-guide/writing_a_plugin.txt (+8/-5)
doc/en/user-guide/zen.txt (+1/-1)
doc/es/index.txt (+1/-1)
doc/es/mini-tutorial/index.txt (+22/-22)
doc/es/user-guide/index-plain.txt (+2/-2)
doc/es/user-guide/index.txt (+2/-2)
doc/es/user-guide/version_info.txt (+17/-17)
doc/index.es.txt (+4/-4)
doc/index.ru.txt (+7/-7)
doc/ja/tutorials/using_bazaar_with_launchpad.txt (+1/-1)
doc/ja/upgrade-guide/data_migration.txt (+1/-1)
doc/ja/user-guide/entering_commands.txt (+1/-1)
doc/ja/user-guide/http_smart_server.txt (+9/-9)
doc/ja/user-guide/introducing_bazaar.txt (+2/-2)
doc/ja/user-guide/setting_up_email.txt (+2/-2)
doc/ja/user-guide/version_info.txt (+3/-3)
doc/ja/user-reference/index.txt (+148/-148)
doc/ru/index.txt (+4/-4)
doc/ru/mini-tutorial/index.txt (+10/-10)
doc/ru/tutorials/centralized_workflow.txt (+4/-4)
doc/ru/tutorials/tutorial.txt (+2/-2)
doc/ru/tutorials/using_bazaar_with_launchpad.txt (+1/-1)
doc/ru/user-guide/branching_a_project.txt (+1/-1)
doc/ru/user-guide/index-plain.txt (+1/-1)
doc/ru/user-guide/index.txt (+1/-1)
doc/ru/user-guide/introducing_bazaar.txt (+2/-2)
doc/ru/user-guide/specifying_revisions.txt (+1/-1)
doc/ru/user-guide/zen.txt (+6/-6)
setup.py (+12/-3)
tools/packaging/build-packages.sh (+1/-1)
tools/packaging/update-changelogs.sh (+12/-7)
tools/packaging/update-control.sh (+31/-0)
tools/packaging/update-packaging-branches.sh (+14/-6)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:bzr