Rev 3149: merge bzr.dev in file:///v/home/vila/src/bzr/bugs/179368/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Thu Jan 3 15:13:09 GMT 2008
At file:///v/home/vila/src/bzr/bugs/179368/
------------------------------------------------------------
revno: 3149
revision-id:v.ladeuil+lp at free.fr-20080103151258-idpzfox078f80vhe
parent: v.ladeuil+lp at free.fr-20080102141355-k20yfjo6i1dasuny
parent: pqm at pqm.ubuntu.com-20080103103822-fj2udnviy9ilfsst
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 179368
timestamp: Thu 2008-01-03 16:12:58 +0100
message:
merge bzr.dev
added:
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
------------------------------------------------------------
revno: 3146.1.12
revision-id:pqm at pqm.ubuntu.com-20080103103822-fj2udnviy9ilfsst
parent: pqm at pqm.ubuntu.com-20080103093833-5bwfhwbkrke2b0cb
parent: v.ladeuil+lp at free.fr-20080103084938-7kvurk5uvde2ui54
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 10:38:22 +0000
message:
(vila) Fix bug #175524, http test servers are 1.1 compliant
added:
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
renamed:
bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/HttpServer.py => bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 3146.1.10.2.1
revision-id:v.ladeuil+lp at free.fr-20080103084938-7kvurk5uvde2ui54
parent: pqm at pqm.ubuntu.com-20080103073604-bdu4u15nqv5hlqb4
parent: v.ladeuil+lp at free.fr-20080103084412-5bjr40bt0hbqorbk
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2008-01-03 09:49:38 +0100
message:
Fix bug #175524, http test servers are 1.1 compliant
added:
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
renamed:
bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/HttpServer.py => bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 3111.1.31
revision-id:v.ladeuil+lp at free.fr-20080103084412-5bjr40bt0hbqorbk
parent: v.ladeuil+lp at free.fr-20071228165130-iv5p12lfc2fmbb7u
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Thu 2008-01-03 09:44:12 +0100
message:
Review feeback.
* bzrlib/tests/test_http.py:
(TestSpecificRequestHandler): Typo in doc string.
* bzrlib/tests/http_server.py:
(TestingHTTPServerMixin.tearDown): Mentioned by Aaron for win32.
modified:
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
------------------------------------------------------------
revno: 3146.1.11
revision-id:pqm at pqm.ubuntu.com-20080103093833-5bwfhwbkrke2b0cb
parent: pqm at pqm.ubuntu.com-20080103073604-bdu4u15nqv5hlqb4
parent: ian.clatworthy at internode.on.net-20080103083727-c10xa4jrvbl6jblb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 09:38:33 +0000
message:
Don't require a working tree in cmd_annotate. (Lukas Lalinsky, #90049)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
------------------------------------------------------------
revno: 3146.1.10.1.1
revision-id:ian.clatworthy at internode.on.net-20080103083727-c10xa4jrvbl6jblb
parent: pqm at pqm.ubuntu.com-20080103073604-bdu4u15nqv5hlqb4
parent: lalinsky at gmail.com-20071229185520-42dr3votzal51sl8
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Thu 2008-01-03 18:37:27 +1000
message:
Don't require a working tree in cmd_annotate. (Lukas Lalinsky, #90049)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
------------------------------------------------------------
revno: 3146.3.1
revision-id:lalinsky at gmail.com-20071229185520-42dr3votzal51sl8
parent: pqm at pqm.ubuntu.com-20071228175832-9kboqtkemnuzzlab
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: annotate-wt
timestamp: Sat 2007-12-29 19:55:20 +0100
message:
Don't require a working tree in cmd_annotate.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
------------------------------------------------------------
revno: 3146.1.10
revision-id:pqm at pqm.ubuntu.com-20080103073604-bdu4u15nqv5hlqb4
parent: pqm at pqm.ubuntu.com-20080103031640-m5fqotep9qaw2jtp
parent: aaron.bentley at utoronto.ca-20080103063853-7sv9zq8m87p7gzf7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 07:36:04 +0000
message:
Add new 'LCA merge' merge algorithm (abentley)
added:
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 3144.3.7
revision-id:aaron.bentley at utoronto.ca-20080103063853-7sv9zq8m87p7gzf7
parent: aaron.bentley at utoronto.ca-20080103063407-yicj1hy2v9s3w39j
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: lcamerge
timestamp: Thu 2008-01-03 01:38:53 -0500
message:
Update from review
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3144.3.6
revision-id:aaron.bentley at utoronto.ca-20080103063407-yicj1hy2v9s3w39j
parent: abentley at panoramicfeedback.com-20071228215000-7i88ux30pcrwce0d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: lcamerge
timestamp: Thu 2008-01-03 01:34:07 -0500
message:
Add documentation of LCA merge
added:
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
modified:
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 3144.3.5
revision-id:abentley at panoramicfeedback.com-20071228215000-7i88ux30pcrwce0d
parent: abentley at panoramicfeedback.com-20071228214916-9yttbqxmtkn4fxct
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: lcamerge
timestamp: Fri 2007-12-28 16:50:00 -0500
message:
Add NEWS entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3144.3.4
revision-id:abentley at panoramicfeedback.com-20071228214916-9yttbqxmtkn4fxct
parent: abentley at panoramicfeedback.com-20071228214518-kbzpqoco171k1jdu
parent: pqm at pqm.ubuntu.com-20071227150146-08nqv2gvo5e3i1n3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: lcamerge
timestamp: Fri 2007-12-28 16:49:16 -0500
message:
Merge from bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3144.3.3
revision-id:abentley at panoramicfeedback.com-20071228214518-kbzpqoco171k1jdu
parent: abentley at panoramicfeedback.com-20071228202604-kkolnauo09glnsbh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: lcamerge
timestamp: Fri 2007-12-28 16:45:18 -0500
message:
Update test for new conflicted types
modified:
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 3144.3.2
revision-id:abentley at panoramicfeedback.com-20071228202604-kkolnauo09glnsbh
parent: abentley at panoramicfeedback.com-20071228201014-hd5g7gsz1ds1mmr4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: lcamerge
timestamp: Fri 2007-12-28 15:26:04 -0500
message:
Get conflict handling working
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3144.3.1
revision-id:abentley at panoramicfeedback.com-20071228201014-hd5g7gsz1ds1mmr4
parent: pqm at pqm.ubuntu.com-20071222080058-lra6luc153ex60w4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: lcamerge
timestamp: Fri 2007-12-28 15:10:14 -0500
message:
Implement LCA merge, with problematic conflict markers
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3146.1.9
revision-id:pqm at pqm.ubuntu.com-20080103031640-m5fqotep9qaw2jtp
parent: pqm at pqm.ubuntu.com-20080102204644-m6dav0cszl5e471x
parent: ian.clatworthy at internode.on.net-20080103022006-6e2hmwowug18rixl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 03:16:40 +0000
message:
Minor tweaks to bug tracker integration documentation (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
------------------------------------------------------------
revno: 3146.1.8.1.1
revision-id:ian.clatworthy at internode.on.net-20080103022006-6e2hmwowug18rixl
parent: pqm at pqm.ubuntu.com-20080102204644-m6dav0cszl5e471x
parent: ian.clatworthy at internode.on.net-20080103021712-yqz18tc6u5t6r59c
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Thu 2008-01-03 12:20:06 +1000
message:
Minor tweaks to bug tracker integration documentation (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
------------------------------------------------------------
revno: 3146.1.8.2.1
revision-id:ian.clatworthy at internode.on.net-20080103021712-yqz18tc6u5t6r59c
parent: pqm at pqm.ubuntu.com-20080102204644-m6dav0cszl5e471x
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.bugs-doc
timestamp: Thu 2008-01-03 12:17:12 +1000
message:
Minor tweaks to bug tracker integration documentation
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
------------------------------------------------------------
revno: 3146.1.8
revision-id:pqm at pqm.ubuntu.com-20080102204644-m6dav0cszl5e471x
parent: pqm at pqm.ubuntu.com-20080102195223-2kpjtcoeqvvcrcki
parent: abentley at panoramicfeedback.com-20071228165208-7lw04cwy51rxagsk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-02 20:46:44 +0000
message:
Handle missing tools gracefully in diff --using (abentley)
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3145.1.2
revision-id:abentley at panoramicfeedback.com-20071228165208-7lw04cwy51rxagsk
parent: abentley at panoramicfeedback.com-20071228163746-975r76opsppiwstk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: no-inventory4
timestamp: Fri 2007-12-28 11:52:08 -0500
message:
Don't swallow other OSErrors
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
------------------------------------------------------------
revno: 3145.1.1
revision-id:abentley at panoramicfeedback.com-20071228163746-975r76opsppiwstk
parent: pqm at pqm.ubuntu.com-20071227150146-08nqv2gvo5e3i1n3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: no-inventory4
timestamp: Fri 2007-12-28 11:37:46 -0500
message:
Handle missing tools gracefully in diff --using
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3146.1.7
revision-id:pqm at pqm.ubuntu.com-20080102195223-2kpjtcoeqvvcrcki
parent: pqm at pqm.ubuntu.com-20080102154906-hqiq6x2eammznjtg
parent: bialix at ukr.net-20080102184754-wig6a9133t410ms7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-02 19:52:23 +0000
message:
(bialix) fix #90847: fix problem with parent location on another
logical drive
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
------------------------------------------------------------
revno: 3139.2.2
revision-id:bialix at ukr.net-20080102184754-wig6a9133t410ms7
parent: bialix at ukr.net-20071221172637-n6ndcccrp5du903x
parent: pqm at pqm.ubuntu.com-20080102154906-hqiq6x2eammznjtg
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: fix.90847
timestamp: Wed 2008-01-02 20:47:54 +0200
message:
merge bzr.dev
added:
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
------------------------------------------------------------
revno: 3139.2.1
revision-id:bialix at ukr.net-20071221172637-n6ndcccrp5du903x
parent: pqm at pqm.ubuntu.com-20071221145325-erktp9le86ik56j1
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: fix.90847
timestamp: Fri 2007-12-21 19:26:37 +0200
message:
bugfix #90847: fix problem with parent location on another logical drive
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
------------------------------------------------------------
revno: 3146.1.6
revision-id:pqm at pqm.ubuntu.com-20080102154906-hqiq6x2eammznjtg
parent: pqm at pqm.ubuntu.com-20080102124444-b366gbq5zk8ka3c4
parent: aaron.bentley at utoronto.ca-20080102053220-sli5860t8rq9dvdn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-02 15:49:06 +0000
message:
ParentsProviders now provide tuples of parents, never lists (abentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3146.2.2
revision-id:aaron.bentley at utoronto.ca-20080102053220-sli5860t8rq9dvdn
parent: aaron.bentley at utoronto.ca-20071230021310-yl7qy9u957ne2u9j
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: parents-provider-fix
timestamp: Wed 2008-01-02 00:32:20 -0500
message:
ParentsProviders now provide tuples of parents, never lists
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3146.1.5
revision-id:pqm at pqm.ubuntu.com-20080102124444-b366gbq5zk8ka3c4
parent: pqm at pqm.ubuntu.com-20080102092158-pz0zkj0mm2zbht1y
parent: ian.clatworthy at internode.on.net-20080102102622-lwzpzakb54rwrm67
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-02 12:44:44 +0000
message:
Don't use weekday names in the trace file (Lukas Lalinsky)
modified:
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
------------------------------------------------------------
revno: 3146.1.4.1.1
revision-id:ian.clatworthy at internode.on.net-20080102102622-lwzpzakb54rwrm67
parent: pqm at pqm.ubuntu.com-20080102092158-pz0zkj0mm2zbht1y
parent: lalinsky at gmail.com-20071227114611-2h1a4ahulre0txp6
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Wed 2008-01-02 20:26:22 +1000
message:
Don't use weekday names in the trace file (Lukas Lalinsky)
modified:
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
------------------------------------------------------------
revno: 3144.2.1
revision-id:lalinsky at gmail.com-20071227114611-2h1a4ahulre0txp6
parent: pqm at pqm.ubuntu.com-20071222080058-lra6luc153ex60w4
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: trace-date-format
timestamp: Thu 2007-12-27 12:46:11 +0100
message:
Don't use weekday names in the trace file.
modified:
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
------------------------------------------------------------
revno: 3146.1.4
revision-id:pqm at pqm.ubuntu.com-20080102092158-pz0zkj0mm2zbht1y
parent: pqm at pqm.ubuntu.com-20080102082344-qret383z2bdk1ud4
parent: ian.clatworthy at internode.on.net-20080102081623-x8s0mtabdg584tzy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-02 09:21:58 +0000
message:
Fixed error reporting of unsupported timezone format (Lukas Lalinsky)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3146.1.2.1.1
revision-id:ian.clatworthy at internode.on.net-20080102081623-x8s0mtabdg584tzy
parent: pqm at pqm.ubuntu.com-20080102072122-nil0bpc9nxyp3tu4
parent: lalinsky at gmail.com-20071227082504-xt6wuvwdpuody4f5
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Wed 2008-01-02 18:16:23 +1000
message:
Fixed error reporting of unsupported timezone format (Lukas Lalinsky)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3144.1.1
revision-id:lalinsky at gmail.com-20071227082504-xt6wuvwdpuody4f5
parent: pqm at pqm.ubuntu.com-20071222080058-lra6luc153ex60w4
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: unsupported-timezone-format
timestamp: Thu 2007-12-27 09:25:04 +0100
message:
Fixed error reporting of unsupported timezone format.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3146.1.3
revision-id:pqm at pqm.ubuntu.com-20080102082344-qret383z2bdk1ud4
parent: pqm at pqm.ubuntu.com-20080102072122-nil0bpc9nxyp3tu4
parent: aaron.bentley at utoronto.ca-20071225060232-671w5ne2q1q1in50
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-02 08:23:44 +0000
message:
Optimize find_branches for standalone repositories (abentley)
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3140.1.9
revision-id:aaron.bentley at utoronto.ca-20071225060232-671w5ne2q1q1in50
parent: aaron.bentley at utoronto.ca-20071222174618-hxp45z0s6oqdf8ju
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: find-branches
timestamp: Tue 2007-12-25 01:02:32 -0500
message:
Optimize find_branches for standalone repositories
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3140.1.8
revision-id:aaron.bentley at utoronto.ca-20071222174618-hxp45z0s6oqdf8ju
parent: abentley at panoramicfeedback.com-20071221230131-zsheywe5tanfcm60
parent: pqm at pqm.ubuntu.com-20071222080058-lra6luc153ex60w4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: find-branches
timestamp: Sat 2007-12-22 12:46:18 -0500
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
------------------------------------------------------------
revno: 3146.1.2
revision-id:pqm at pqm.ubuntu.com-20080102072122-nil0bpc9nxyp3tu4
parent: pqm at pqm.ubuntu.com-20080102042542-13ocbo4243mov89j
parent: ian.clatworthy at internode.on.net-20080102062224-84fjc4mwvze2nz26
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-02 07:21:22 +0000
message:
Using Bazaar with Launchpad (Ian Clatworthy)
added:
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
------------------------------------------------------------
revno: 3146.1.1.1.1
revision-id:ian.clatworthy at internode.on.net-20080102062224-84fjc4mwvze2nz26
parent: pqm at pqm.ubuntu.com-20080102042542-13ocbo4243mov89j
parent: ian.clatworthy at internode.on.net-20080102060935-etow85qvqe07qhfc
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Wed 2008-01-02 16:22:24 +1000
message:
Using Bazaar with Launchpad (Ian Clatworthy)
added:
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
------------------------------------------------------------
revno: 3101.2.5
revision-id:ian.clatworthy at internode.on.net-20080102060935-etow85qvqe07qhfc
parent: ian.clatworthy at internode.on.net-20071214032015-m2bz4qyxnt44mser
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.ug-lp
timestamp: Wed 2008-01-02 16:09:35 +1000
message:
Feedback from jam and jml
modified:
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
------------------------------------------------------------
revno: 3101.2.4
revision-id:ian.clatworthy at internode.on.net-20071214032015-m2bz4qyxnt44mser
parent: ian.clatworthy at internode.on.net-20071211121449-fr2lxjxqax0bhja5
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.ug-lp
timestamp: Fri 2007-12-14 13:20:15 +1000
message:
include feedback from kiko
renamed:
doc/en/tutorials/using_bazaar_with_lp.txt => doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
modified:
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
------------------------------------------------------------
revno: 3101.2.3
revision-id:ian.clatworthy at internode.on.net-20071211121449-fr2lxjxqax0bhja5
parent: ian.clatworthy at internode.on.net-20071211115458-1b3y7tl5uyyf5xml
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.ug-lp
timestamp: Tue 2007-12-11 22:14:49 +1000
message:
chapter -> tutorial fix
modified:
doc/en/tutorials/using_bazaar_with_lp.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
------------------------------------------------------------
revno: 3101.2.2
revision-id:ian.clatworthy at internode.on.net-20071211115458-1b3y7tl5uyyf5xml
parent: ian.clatworthy at internode.on.net-20071211073235-1ee87xtdf90ug15t
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.ug-lp
timestamp: Tue 2007-12-11 21:54:58 +1000
message:
aded NEWS item
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3101.2.1
revision-id:ian.clatworthy at internode.on.net-20071211073235-1ee87xtdf90ug15t
parent: pqm at pqm.ubuntu.com-20071211022658-n271ob77ifucx9q3
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.ug-lp
timestamp: Tue 2007-12-11 17:32:35 +1000
message:
Add Using Bazaar with LP tutorial
added:
doc/en/tutorials/using_bazaar_with_lp.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
modified:
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
------------------------------------------------------------
revno: 3146.1.1
revision-id:pqm at pqm.ubuntu.com-20080102042542-13ocbo4243mov89j
parent: pqm at pqm.ubuntu.com-20071228175832-9kboqtkemnuzzlab
parent: aaron.bentley at utoronto.ca-20071230021310-yl7qy9u957ne2u9j
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-02 04:25:42 +0000
message:
Fix handling of ghost revisions in KnitParentsProvider (abentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3146.2.1
revision-id:aaron.bentley at utoronto.ca-20071230021310-yl7qy9u957ne2u9j
parent: pqm at pqm.ubuntu.com-20071228175832-9kboqtkemnuzzlab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: parents-provider-fix
timestamp: Sat 2007-12-29 21:13:10 -0500
message:
Fix bad ghost handling in KnitParentsProvider
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
-------------- next part --------------
Diff too large for email (1756 lines, the limit is 1000).
More information about the bazaar-commits
mailing list