Rev 4662: Merge cleanup into 638451-malformed in file:///home/vila/src/bzr/experimental/conflict-manager/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Dec 17 11:54:27 GMT 2010
At file:///home/vila/src/bzr/experimental/conflict-manager/
------------------------------------------------------------
revno: 4662 [merge]
revision-id: v.ladeuil+lp at free.fr-20101217115426-v6k0ggtyvf3vqy3n
parent: v.ladeuil+lp at free.fr-20101203075235-gkdxzf7no10sjcfe
parent: v.ladeuil+lp at free.fr-20101217115423-dnoji723n7vp7ux1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 638451-malformed
timestamp: Fri 2010-12-17 12:54:26 +0100
message:
Merge cleanup into 638451-malformed
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/controldir.py controldir.py-20100802102926-hvtvh0uae5epuibp-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_dpush.py test_dpush.py-20090108125928-st1td6le59g0vyv2-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/doc_generate/__init__.py __init__.py-20100429153409-fpdr7jznxqojupd2-1
bzrlib/tests/doc_generate/builders/test_texinfo.py test_texinfo.py-20100429153416-rrbyt0aljyz1mgl8-1
bzrlib/tests/doc_generate/writers/test_texinfo.py test_texinfo.py-20100706132149-5xascqycp14tbyci-1
bzrlib/tests/https_server.py https_server.py-20071121173708-aj8zczi0ziwbwz21-1
bzrlib/tests/per_branch/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/per_branch/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/per_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test__groupcompress.py test__groupcompress_-20080724145854-koifwb7749cfzrvj-1
bzrlib/tests/test__known_graph.py test__known_graph.py-20090610185421-vw8vfda2cgnckgb1-2
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_foreign.py test_foreign.py-20081125004048-ywb901edgp9lluxo-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_groupcompress.py test_groupcompress.p-20080705181503-ccbxd6xuy1bdnrpu-13
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_https_ca_bundle.py test_https_ca_bundle-20070226095439-x5899kvqg7xsbk8e-1
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_lock.py test_lock.py-20090710175042-di2e9181kolh1nn3-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_server.py test_server.py-20100209163834-im1ozfuenfmqaa2m-1
bzrlib/tests/test_test_server.py test_test_server.py-20100601152414-r8rln0ok7514pcoz-1
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
doc/developers/bug-handling.txt bughandling.txt-20090615072247-mplym00zjq2n4s61-1
doc/developers/check.txt check.txt-20090506031430-9brd02w516phv8os-1
doc/developers/code-style.txt codestyle.txt-20100515105711-133ealf7ereiq2eq-1
doc/developers/directory-fingerprints.txt directoryfingerprint-20070731033348-okmllh4b5srdtlk2-1
doc/developers/ec2.txt ec2windows.txt-20090219062112-2ga0nqpcm7n02njf-1
doc/developers/initial-push-pull.txt initialpushpull.rst-20070527184539-wodba32mi5dehhct-1
doc/developers/inventory.txt inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/developers/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
doc/developers/tortoise-strategy.txt tortoisestrategy.txt-20080403024510-2ahdqrvnwqrb5p5t-1
doc/developers/transports.txt transports.txt-20100716091505-sd18bmz2c3t8qold-1
doc/developers/win32_build_setup.txt win32_build_setup.tx-20091104201959-pvlau2f8dndoxjj8-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/release-notes/bzr-0.1.txt bzr0.1.txt-20101008081016-21wd86gpfhllpue3-1
doc/en/release-notes/bzr-0.11.txt bzr0.11.txt-20101008081016-21wd86gpfhllpue3-3
doc/en/release-notes/bzr-0.13.txt bzr0.13.txt-20101008081016-21wd86gpfhllpue3-5
doc/en/release-notes/bzr-0.14.txt bzr0.14.txt-20101008081016-21wd86gpfhllpue3-6
doc/en/release-notes/bzr-0.15.txt bzr0.15.txt-20101008081016-21wd86gpfhllpue3-7
doc/en/release-notes/bzr-0.16.txt bzr0.16.txt-20101008081016-21wd86gpfhllpue3-8
doc/en/release-notes/bzr-0.18.txt bzr0.18.txt-20101008081016-21wd86gpfhllpue3-10
doc/en/release-notes/bzr-0.6.txt bzr0.6.txt-20101008081016-21wd86gpfhllpue3-11
doc/en/release-notes/bzr-0.7.txt bzr0.7.txt-20101008081016-21wd86gpfhllpue3-12
doc/en/release-notes/bzr-0.8.txt bzr0.8.txt-20101008081016-21wd86gpfhllpue3-13
doc/en/release-notes/bzr-0.9.txt bzr0.9.txt-20101008081016-21wd86gpfhllpue3-14
doc/en/release-notes/bzr-0.90.txt bzr0.90.txt-20101008081016-21wd86gpfhllpue3-15
doc/en/release-notes/bzr-0.91.txt bzr0.91.txt-20101008081016-21wd86gpfhllpue3-16
doc/en/release-notes/bzr-0.92.txt bzr0.92.txt-20101008081016-21wd86gpfhllpue3-17
doc/en/release-notes/bzr-1.0.txt bzr1.0.txt-20101008081016-21wd86gpfhllpue3-18
doc/en/release-notes/bzr-1.1.txt bzr1.1.txt-20101008081016-21wd86gpfhllpue3-19
doc/en/release-notes/bzr-1.11.txt bzr1.11.txt-20101008081016-21wd86gpfhllpue3-21
doc/en/release-notes/bzr-1.12.txt bzr1.12.txt-20101008081016-21wd86gpfhllpue3-22
doc/en/release-notes/bzr-1.13.txt bzr1.13.txt-20101008081016-21wd86gpfhllpue3-23
doc/en/release-notes/bzr-1.15.txt bzr1.15.txt-20101008081016-21wd86gpfhllpue3-25
doc/en/release-notes/bzr-1.16.txt bzr1.16.txt-20101008081016-21wd86gpfhllpue3-26
doc/en/release-notes/bzr-1.17.txt bzr1.17.txt-20101008081016-21wd86gpfhllpue3-27
doc/en/release-notes/bzr-1.18.txt bzr1.18.txt-20101008081016-21wd86gpfhllpue3-28
doc/en/release-notes/bzr-1.2.txt bzr1.2.txt-20101008081016-21wd86gpfhllpue3-29
doc/en/release-notes/bzr-1.3.txt bzr1.3.txt-20101008081016-21wd86gpfhllpue3-30
doc/en/release-notes/bzr-1.4.txt bzr1.4.txt-20101008081016-21wd86gpfhllpue3-31
doc/en/release-notes/bzr-1.5.txt bzr1.5.txt-20101008081016-21wd86gpfhllpue3-32
doc/en/release-notes/bzr-1.6.txt bzr1.6.txt-20101008081016-21wd86gpfhllpue3-33
doc/en/release-notes/bzr-1.7.txt bzr1.7.txt-20101008081016-21wd86gpfhllpue3-34
doc/en/release-notes/bzr-1.8.txt bzr1.8.txt-20101008081016-21wd86gpfhllpue3-35
doc/en/release-notes/bzr-1.9.txt bzr1.9.txt-20101008081016-21wd86gpfhllpue3-36
doc/en/release-notes/bzr-2.0.txt bzr2.0.txt-20101008081016-21wd86gpfhllpue3-37
doc/en/release-notes/bzr-2.1.txt bzr2.1.txt-20101008081016-21wd86gpfhllpue3-38
doc/en/release-notes/bzr-2.2.txt bzr2.2.txt-20101008081016-21wd86gpfhllpue3-39
doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
doc/en/tutorials/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
doc/en/upgrade-guide/data_migration.txt data_migration.txt-20090702082510-q2pocf7uhntljqnl-2
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/organizing_your_workspace.txt organizing_your_work-20090226112520-bc2njq3kwvpeo814-1
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
doc/en/whats-new/whats-new-in-2.3.txt whatsnewin2.3.txt-20100818072501-x2h25r7jbnknvy30-1
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
doc/ru/tutorials/tutorial.txt tutorial.txt-20090602180629-wkp7wr27jl4i2zep-1
doc/ru/user-guide/branching_a_project.txt branching_a_project.-20090602104644-pjpwfx7xh2k5l0ba-1
tools/win32/bazaar.url bazaar.url-20060622100836-b3yup582rt3y0nvm-4
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/buildout.cfg buildout.cfg-20090529141919-d4paovt3buwxgjpd-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
-------------- next part --------------
Diff too large for email (4197 lines, the limit is 1000).
More information about the bazaar-commits
mailing list