Rev 2504: merge dirstate (and trunk) in file:///home/mbp/bzr/Work/dirstate/
Martin Pool
mbp at sourcefrog.net
Mon Mar 5 04:13:58 GMT 2007
------------------------------------------------------------
revno: 2504
revision-id: mbp at sourcefrog.net-20070305041353-o81chijxnnurl2bv
parent: mbp at sourcefrog.net-20070305035531-1t1wn6oy526vrb0q
parent: robertc at robertcollins.net-20070305034356-og43j35eg62m952f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-03-05 15:13:53 +1100
message:
merge dirstate (and trunk)
added:
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/branch_implementations/test_tags.py test_tags.py-20070212110545-w2s799hm2jlbsmg5-1
bzrlib/tests/test_https_ca_bundle.py test_https_ca_bundle-20070226095439-x5899kvqg7xsbk8e-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/transport/http/ca_bundle.py ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/smart.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
doc/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
------------------------------------------------------------
revno: 2498.1.6
merged: robertc at robertcollins.net-20070305034356-og43j35eg62m952f
parent: robertc at robertcollins.net-20070305031021-ypbakvagbivyw5mu
parent: pqm at pqm.ubuntu.com-20070302224952-1f19efc6c320215f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-03-05 14:43:56 +1100
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2255.1.57
merged: pqm at pqm.ubuntu.com-20070302224952-1f19efc6c320215f
parent: pqm at pqm.ubuntu.com-20070302210006-317f7fb7479da4c5
parent: john at arbash-meinel.com-20070302223607-ht1xxgyvfwom3m2t
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-02 22:49:52 +0000
message:
(James Westby) Allow 'bzr cat' to be used against treeless repositories.
------------------------------------------------------------
revno: 2255.1.56.1.1
merged: john at arbash-meinel.com-20070302223607-ht1xxgyvfwom3m2t
parent: pqm at pqm.ubuntu.com-20070302210006-317f7fb7479da4c5
parent: jw+debian at jameswestby.net-20070302181505-h0c9wyrvzp3wslpp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-03-02 16:36:07 -0600
message:
(James Westby) Allow 'bzr cat' to be used against treeless repositories.
------------------------------------------------------------
revno: 2255.1.54.1.2
merged: jw+debian at jameswestby.net-20070302181505-h0c9wyrvzp3wslpp
parent: jw+debian at jameswestby.net-20070302172650-4cjj7xzvpe93c72v
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Fri 2007-03-02 18:15:05 +0000
message:
Use BzrDir.open_containing_tree_or_branch as suggested by Aaron.
------------------------------------------------------------
revno: 2255.1.54.1.1
merged: jw+debian at jameswestby.net-20070302172650-4cjj7xzvpe93c72v
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Fri 2007-03-02 17:26:50 +0000
message:
Allow bzr cat to be used against treeless repositories.
* Currently if bzr cat is used against a treeless repo it fails as the
working tree can't be opened. As cat can work without a working tree
just ignore this error, and use the existing fallback path that opens
the branch instead.
------------------------------------------------------------
revno: 2255.1.56
merged: pqm at pqm.ubuntu.com-20070302210006-317f7fb7479da4c5
parent: pqm at pqm.ubuntu.com-20070302193726-85e12b9ff3c35674
parent: abentley at panoramicfeedback.com-20070302175232-sp3et54asva32az5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-02 21:00:06 +0000
message:
Documentation cleanup (Brad Crittenden)
------------------------------------------------------------
revno: 2255.1.38.1.7
merged: abentley at panoramicfeedback.com-20070302175232-sp3et54asva32az5
parent: bac at canonical.com-20070302124045-3a9o45va231z0w0a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Fri 2007-03-02 12:52:32 -0500
message:
Fix heading formatting
------------------------------------------------------------
revno: 2255.1.38.1.6
merged: bac at canonical.com-20070302124045-3a9o45va231z0w0a
parent: bac at canonical.com-20070227221414-du51ihnpkdu59geo
committer: Brad Crittenden <bac at canonical.com>
branch nick: bzr.dev
timestamp: Fri 2007-03-02 07:40:45 -0500
message:
post review changes
------------------------------------------------------------
revno: 2255.1.38.1.5
merged: bac at canonical.com-20070227221414-du51ihnpkdu59geo
parent: bac at canonical.com-20070227221101-b854hjop5278bqqb
parent: joe at blow.com-20070227214342-ixfizya7jemgtady
committer: Brad Crittenden <bac at canonical.com>
branch nick: bzr.dev
timestamp: Tue 2007-02-27 17:14:14 -0500
message:
Merge from my LP branch
------------------------------------------------------------
revno: 2255.1.38.1.2.1.2
merged: joe at blow.com-20070227214342-ixfizya7jemgtady
parent: joe at blow.com-20070227212438-ndpq6lsmn9ahroz5
committer: joe blow <joe at blow.com>
branch nick: bzr.dev
timestamp: Tue 2007-02-27 16:43:42 -0500
message:
Updated version_info.txt for grammar changes
------------------------------------------------------------
revno: 2255.1.38.1.2.1.1
merged: joe at blow.com-20070227212438-ndpq6lsmn9ahroz5
parent: brad.crittenden at canonical.com-20070226205610-44oatbxrjjz3ajwy
committer: joe blow <joe at blow.com>
branch nick: bzr.dev
timestamp: Tue 2007-02-27 16:24:38 -0500
message:
Updated documents for grammer, spelling, and clarity.
------------------------------------------------------------
revno: 2255.1.38.1.4
merged: bac at canonical.com-20070227221101-b854hjop5278bqqb
parent: bac at canonical.com-20070227220504-es0kpgzrjetontoi
parent: pqm at pqm.ubuntu.com-20070227220846-8cce3b2986915092
committer: Brad Crittenden <bac at canonical.com>
branch nick: bzr.dev
timestamp: Tue 2007-02-27 17:11:01 -0500
message:
Merge from trunk.
------------------------------------------------------------
revno: 2255.1.38.1.3
merged: bac at canonical.com-20070227220504-es0kpgzrjetontoi
parent: brad.crittenden at canonical.com-20070226205610-44oatbxrjjz3ajwy
committer: Brad Crittenden <bac at canonical.com>
branch nick: bzr.dev
timestamp: Tue 2007-02-27 17:05:04 -0500
message:
Updated version_info.txt for grammar changes
------------------------------------------------------------
revno: 2255.1.38.1.2
merged: brad.crittenden at canonical.com-20070226205610-44oatbxrjjz3ajwy
parent: brad.crittenden at canonical.com-20070216171028-43ozltjcna8z4fu7
parent: pqm at pqm.ubuntu.com-20070226201622-2f1d97a573b34d44
committer: Brad Crittenden <Brad.Crittenden at canonical.com>
branch nick: bzr.dev
timestamp: Mon 2007-02-26 15:56:10 -0500
message:
merge
------------------------------------------------------------
revno: 2255.1.38.1.1
merged: brad.crittenden at canonical.com-20070216171028-43ozltjcna8z4fu7
parent: pqm at pqm.ubuntu.com-20070216064835-76166d68f1750e11
committer: Brad Crittenden <Brad.Crittenden at canonical.com>
branch nick: bzr.dev
timestamp: Fri 2007-02-16 12:10:28 -0500
message:
Corrected some trivial grammar and spelling mistakes.
Corrected formating for enumerated lists.
Added reference to 'bzr resolve' which was omitted.
------------------------------------------------------------
revno: 2255.1.55
merged: pqm at pqm.ubuntu.com-20070302193726-85e12b9ff3c35674
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
parent: john at arbash-meinel.com-20070302152321-hgsk2328bwgi1e6g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-02 19:37:26 +0000
message:
(John Arbash Meinel) fix a regression in Inventory.iter_entries_by_dir
------------------------------------------------------------
revno: 2255.1.49.1.2
merged: john at arbash-meinel.com-20070302152321-hgsk2328bwgi1e6g
parent: john at arbash-meinel.com-20070228151923-1s7oa2i2kk9u9ufo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-03-02 09:23:21 -0600
message:
Use a set for specific ids for Inventory.iter_entries_by_dir
------------------------------------------------------------
revno: 2255.1.54
merged: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
parent: pqm at pqm.ubuntu.com-20070301065357-e0804257b4f378cf
parent: mbp at sourcefrog.net-20070301071555-lalebdbi2pltrdnj
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-01 07:30:00 +0000
message:
(mbp) tags in branch
------------------------------------------------------------
revno: 2220.2.49
merged: mbp at sourcefrog.net-20070301071555-lalebdbi2pltrdnj
parent: mbp at sourcefrog.net-20070301064729-1y0zb2ap6ntxm9d4
parent: pqm at pqm.ubuntu.com-20070301065357-e0804257b4f378cf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-03-01 18:15:55 +1100
message:
merge trunk
------------------------------------------------------------
revno: 2220.2.48
merged: mbp at sourcefrog.net-20070301064729-1y0zb2ap6ntxm9d4
parent: mbp at sourcefrog.net-20070301043643-ho3snagjdl64a96g
parent: mbp at sourcefrog.net-20070301041528-14my1q8v0buynzut
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-03-01 17:47:29 +1100
message:
merge up tags and resultobject
------------------------------------------------------------
revno: 2255.1.42.1.6
merged: mbp at sourcefrog.net-20070301041528-14my1q8v0buynzut
parent: mbp at sourcefrog.net-20070225104133-nd8tyugcozbq1uox
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: resultobj
timestamp: Thu 2007-03-01 15:15:28 +1100
message:
Add docs for Results, give some members cleaner names
------------------------------------------------------------
revno: 2220.2.47
merged: mbp at sourcefrog.net-20070301043643-ho3snagjdl64a96g
parent: mbp at sourcefrog.net-20070301042655-ib2mllvaozai23c6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-03-01 15:36:43 +1100
message:
Empty BRANCH.TODO; things to do in the future are moved into launchpad bugs
------------------------------------------------------------
revno: 2220.2.46
merged: mbp at sourcefrog.net-20070301042655-ib2mllvaozai23c6
parent: mbp at sourcefrog.net-20070226055708-llf8iqw3ny1f3al6
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-03-01 15:26:55 +1100
message:
merge trunk
------------------------------------------------------------
revno: 2220.2.45
merged: mbp at sourcefrog.net-20070226055708-llf8iqw3ny1f3al6
parent: mbp at sourcefrog.net-20070226053612-21tf7x7uvb4qru1b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:57:08 +1100
message:
Make tags output less wide
------------------------------------------------------------
revno: 2220.2.44
merged: mbp at sourcefrog.net-20070226053612-21tf7x7uvb4qru1b
parent: mbp at sourcefrog.net-20070226053332-a0hjhbzhmjxmreq3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:36:12 +1100
message:
tags output needs newlines
------------------------------------------------------------
revno: 2220.2.43
merged: mbp at sourcefrog.net-20070226053332-a0hjhbzhmjxmreq3
parent: mbp at sourcefrog.net-20070226052905-7mt8m6871e9dym8e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:33:32 +1100
message:
Should clear tag file when upgrading format 5 to 6 to prevent warning
------------------------------------------------------------
revno: 2220.2.42
merged: mbp at sourcefrog.net-20070226052905-7mt8m6871e9dym8e
parent: mbp at sourcefrog.net-20070226050852-791ohdf63hd52yt1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:29:05 +1100
message:
Tag command refuses to replace existing tags unless you force it.
Add Tags.has_tag.
------------------------------------------------------------
revno: 2220.2.41
merged: mbp at sourcefrog.net-20070226050852-791ohdf63hd52yt1
parent: mbp at sourcefrog.net-20070226050833-jnc2m7sji8uzrnk8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:08:52 +1100
message:
Fix tag help (fullermd)
------------------------------------------------------------
revno: 2220.2.40
merged: mbp at sourcefrog.net-20070226050833-jnc2m7sji8uzrnk8
parent: mbp at sourcefrog.net-20070225114916-6ahkk1nkyknophma
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:08:33 +1100
message:
stubbed-out tests
------------------------------------------------------------
revno: 2220.2.39
merged: mbp at sourcefrog.net-20070225114916-6ahkk1nkyknophma
parent: mbp at sourcefrog.net-20070225111726-w5a6asp76autb02f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-02-25 22:49:16 +1100
message:
Pull also merges tags and warns if they conflict
------------------------------------------------------------
revno: 2220.2.38
merged: mbp at sourcefrog.net-20070225111726-w5a6asp76autb02f
parent: mbp at sourcefrog.net-20070225111100-iqd6o1x34mv0a60g
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-02-25 22:17:26 +1100
message:
Tag conflicts from push go to stdout.
Cleanup blackbox tests.
------------------------------------------------------------
revno: 2220.2.37
merged: mbp at sourcefrog.net-20070225111100-iqd6o1x34mv0a60g
parent: mbp at sourcefrog.net-20070225105125-32o9nqxk062ncix0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-02-25 22:11:00 +1100
message:
Report conflicting tags from push.
Factor out PushResult.report()
------------------------------------------------------------
revno: 2220.2.36
merged: mbp at sourcefrog.net-20070225105125-32o9nqxk062ncix0
parent: mbp at sourcefrog.net-20070225104729-st8znu3255avneia
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-02-25 21:51:25 +1100
message:
Push and pull operations now merge tags and report conflicts in their result
------------------------------------------------------------
revno: 2220.2.35
merged: mbp at sourcefrog.net-20070225104729-st8znu3255avneia
parent: mbp at sourcefrog.net-20070222055851-5u09rtof609irx60
parent: mbp at sourcefrog.net-20070225104133-nd8tyugcozbq1uox
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-02-25 21:47:29 +1100
message:
merge result-object changes
------------------------------------------------------------
revno: 2255.1.42.1.5
merged: mbp at sourcefrog.net-20070225104133-nd8tyugcozbq1uox
parent: mbp at sourcefrog.net-20070225104016-np1gvynr1nqkbnpo
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: resultobj
timestamp: Sun 2007-02-25 21:41:33 +1100
message:
Update hook docs
------------------------------------------------------------
revno: 2255.1.42.1.4
merged: mbp at sourcefrog.net-20070225104016-np1gvynr1nqkbnpo
parent: mbp at sourcefrog.net-20070223055544-ux2lcobwiudl3f53
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: resultobj
timestamp: Sun 2007-02-25 21:40:16 +1100
message:
Push now returns a PushResult rather than just an integer.
This result object is also passed to the push hooks.
pull ui slightly clearer about what has happened.
------------------------------------------------------------
revno: 2255.1.42.1.3
merged: mbp at sourcefrog.net-20070223055544-ux2lcobwiudl3f53
parent: mbp at sourcefrog.net-20070223054511-g9ctoxpgcq0d2sl4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: resultobj
timestamp: Fri 2007-02-23 16:55:44 +1100
message:
PullResult can pretend to be an int for api compatibility with old .pull()
------------------------------------------------------------
revno: 2255.1.42.1.2
merged: mbp at sourcefrog.net-20070223054511-g9ctoxpgcq0d2sl4
parent: mbp at sourcefrog.net-20070223053935-r601f8e1xwwljm21
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: resultobj
timestamp: Fri 2007-02-23 16:45:11 +1100
message:
Cleanup imports
------------------------------------------------------------
revno: 2255.1.42.1.1
merged: mbp at sourcefrog.net-20070223053935-r601f8e1xwwljm21
parent: pqm at pqm.ubuntu.com-20070221200818-3edf47a2bd3f472b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: resultobj
timestamp: Fri 2007-02-23 16:39:35 +1100
message:
Pull now returns a PullResult rather than just an integer.
Remove old Branch.is_control_file function.
------------------------------------------------------------
revno: 2220.2.34
merged: mbp at sourcefrog.net-20070222055851-5u09rtof609irx60
parent: mbp at sourcefrog.net-20070222054903-nmadtvw96a88uq2w
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 16:58:51 +1100
message:
Add a better test for tags command
------------------------------------------------------------
revno: 2220.2.33
merged: mbp at sourcefrog.net-20070222054903-nmadtvw96a88uq2w
parent: mbp at sourcefrog.net-20070222050352-98ohnhisvcc71ela
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 16:49:03 +1100
message:
Start support for flagging tag conflicts
------------------------------------------------------------
revno: 2220.2.32
merged: mbp at sourcefrog.net-20070222050352-98ohnhisvcc71ela
parent: mbp at sourcefrog.net-20070222045206-zxhd8xxpepbuw8uj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 16:03:52 +1100
message:
Slightly smarter tag merge
------------------------------------------------------------
revno: 2220.2.31
merged: mbp at sourcefrog.net-20070222045206-zxhd8xxpepbuw8uj
parent: mbp at sourcefrog.net-20070222043908-wt92joyurcxds96p
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 15:52:06 +1100
message:
tag cleanups
------------------------------------------------------------
revno: 2220.2.30
merged: mbp at sourcefrog.net-20070222043908-wt92joyurcxds96p
parent: mbp at sourcefrog.net-20070222030533-4e9nxag9ykjffq3s
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 15:39:08 +1100
message:
split out tag-merging code and add some tests
------------------------------------------------------------
revno: 2220.2.29
merged: mbp at sourcefrog.net-20070222030533-4e9nxag9ykjffq3s
parent: mbp at sourcefrog.net-20070222030454-qbli35zu25vq59q2
parent: pqm at pqm.ubuntu.com-20070221200818-3edf47a2bd3f472b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 14:05:33 +1100
message:
merge status false-failure fix from dev
------------------------------------------------------------
revno: 2220.2.28
merged: mbp at sourcefrog.net-20070222030454-qbli35zu25vq59q2
parent: mbp at sourcefrog.net-20070221073559-lhmy548t6172pd5e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-22 14:04:54 +1100
message:
Integrate tags with Branch6:
Make a tags file when initializing a branch; warn if it's not there in case
someone has a branch using an unreleased version of this code.
------------------------------------------------------------
revno: 2220.2.27
merged: mbp at sourcefrog.net-20070221073559-lhmy548t6172pd5e
parent: mbp at sourcefrog.net-20070221053456-vyr6o0ehqnbetrvb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 18:35:59 +1100
message:
Start adding tags to Branch6
------------------------------------------------------------
revno: 2220.2.26
merged: mbp at sourcefrog.net-20070221053456-vyr6o0ehqnbetrvb
parent: mbp at sourcefrog.net-20070221051910-lk8hx799ohujeopd
parent: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 16:34:56 +1100
message:
merge trunk, in particular new Branch6 changes
------------------------------------------------------------
revno: 2220.2.25
merged: mbp at sourcefrog.net-20070221051910-lk8hx799ohujeopd
parent: mbp at sourcefrog.net-20070221050828-yqvr0i3if980i8sy
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 16:19:10 +1100
message:
doc
------------------------------------------------------------
revno: 2220.2.24
merged: mbp at sourcefrog.net-20070221050828-yqvr0i3if980i8sy
parent: mbp at sourcefrog.net-20070221050651-2if33edbetuiv2vf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 16:08:28 +1100
message:
Add tags command
------------------------------------------------------------
revno: 2220.2.23
merged: mbp at sourcefrog.net-20070221050651-2if33edbetuiv2vf
parent: mbp at sourcefrog.net-20070221044547-0a55m0h9euy2q43l
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 16:06:51 +1100
message:
Fix TagsNotSupportedError
------------------------------------------------------------
revno: 2220.2.22
merged: mbp at sourcefrog.net-20070221044547-0a55m0h9euy2q43l
parent: mbp at sourcefrog.net-20070221040827-udbcbv0raghknyl5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 15:45:47 +1100
message:
doc
------------------------------------------------------------
revno: 2220.2.21
merged: mbp at sourcefrog.net-20070221040827-udbcbv0raghknyl5
parent: mbp at sourcefrog.net-20070220075000-2hz26ddu1hm28jrl
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-02-21 15:08:27 +1100
message:
Add tag --delete command and implementation
------------------------------------------------------------
revno: 2220.2.20
merged: mbp at sourcefrog.net-20070220075000-2hz26ddu1hm28jrl
parent: mbp at sourcefrog.net-20070220054112-5ch1jqmy9m5zbk72
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Tue 2007-02-20 18:50:00 +1100
message:
Tag methods now available through Branch.tags.add_tag, etc
------------------------------------------------------------
revno: 2220.2.19
merged: mbp at sourcefrog.net-20070220054112-5ch1jqmy9m5zbk72
parent: mbp at sourcefrog.net-20070215012807-d5ocuw66i5j8dclk
parent: mbp at sourcefrog.net-20070220052557-e3jtl3uan4ynrtot
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Tue 2007-02-20 16:41:12 +1100
message:
merge bencode licence, branch todo
------------------------------------------------------------
revno: 2220.2.10.1.2
merged: mbp at sourcefrog.net-20070220052557-e3jtl3uan4ynrtot
parent: mbp at sourcefrog.net-20070220044754-ptovhd212hs4vkkf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Tue 2007-02-20 16:25:57 +1100
message:
add branch todo notes
------------------------------------------------------------
revno: 2220.2.10.1.1
merged: mbp at sourcefrog.net-20070220044754-ptovhd212hs4vkkf
parent: mbp at sourcefrog.net-20070212071826-5x37ixz8r6cylk75
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Tue 2007-02-20 15:47:54 +1100
message:
add bencode utility
------------------------------------------------------------
revno: 2220.2.18
merged: mbp at sourcefrog.net-20070215012807-d5ocuw66i5j8dclk
parent: mbp at sourcefrog.net-20070215012329-blt2xfhup97r6w8h
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-15 12:28:07 +1100
message:
get repository formats from new location
------------------------------------------------------------
revno: 2220.2.17
merged: mbp at sourcefrog.net-20070215012329-blt2xfhup97r6w8h
parent: mbp at sourcefrog.net-20070213131837-7p45uhe445mwk4c4
parent: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-15 12:23:29 +1100
message:
merge up from bzr.dev to get metadir changes
------------------------------------------------------------
revno: 2220.2.16
merged: mbp at sourcefrog.net-20070213131837-7p45uhe445mwk4c4
parent: mbp at sourcefrog.net-20070213130100-haw30ue83sibl2lt
committer: mbp at sourcefrog.net
branch nick: tags
timestamp: Wed 2007-02-14 00:18:37 +1100
message:
Make Branch._transport be the branch's control file transport
------------------------------------------------------------
revno: 2220.2.15
merged: mbp at sourcefrog.net-20070213130100-haw30ue83sibl2lt
parent: mbp at sourcefrog.net-20070213082041-8z35j43es3r16fzv
committer: mbp at sourcefrog.net
branch nick: tags
timestamp: Wed 2007-02-14 00:01:00 +1100
message:
Store tag dictionary in bencode and accomodate non-ascii tags
Add bencode in util
------------------------------------------------------------
revno: 2220.2.14
merged: mbp at sourcefrog.net-20070213082041-8z35j43es3r16fzv
parent: mbp at sourcefrog.net-20070213080651-ccfwj9hatjya3j19
committer: mbp at sourcefrog.net
branch nick: tags
timestamp: Tue 2007-02-13 19:20:41 +1100
message:
cleanup
------------------------------------------------------------
revno: 2220.2.13
merged: mbp at sourcefrog.net-20070213080651-ccfwj9hatjya3j19
parent: mbp at sourcefrog.net-20070212114643-14sr6fjvz3cx6omz
committer: mbp at sourcefrog.net
branch nick: tags
timestamp: Tue 2007-02-13 19:06:51 +1100
message:
reconnect and fix up lower-level tests for tags
------------------------------------------------------------
revno: 2220.2.12
merged: mbp at sourcefrog.net-20070212114643-14sr6fjvz3cx6omz
parent: mbp at sourcefrog.net-20070212110825-3plwqzl5vlhf417k
committer: mbp at sourcefrog.net
branch nick: tags
timestamp: Mon 2007-02-12 22:46:43 +1100
message:
BzrBranchExperimental can now act as its own format
------------------------------------------------------------
revno: 2220.2.11
merged: mbp at sourcefrog.net-20070212110825-3plwqzl5vlhf417k
parent: mbp at sourcefrog.net-20070212071826-5x37ixz8r6cylk75
committer: mbp at sourcefrog.net
branch nick: tags
timestamp: Mon 2007-02-12 22:08:25 +1100
message:
Get tag tests working again, stored in the Branch
------------------------------------------------------------
revno: 2220.2.10
merged: mbp at sourcefrog.net-20070212071826-5x37ixz8r6cylk75
parent: mbp at sourcefrog.net-20070124050955-q7fed1sy7ddc78ui
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-12 18:18:26 +1100
message:
(broken) start moving things to branches
------------------------------------------------------------
revno: 2220.2.9
merged: mbp at sourcefrog.net-20070124050955-q7fed1sy7ddc78ui
parent: mbp at sourcefrog.net-20070121124213-8ksq92nrm3tzn6s9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-01-24 16:09:55 +1100
message:
Add specific tests for push -d and pull -d
------------------------------------------------------------
revno: 2220.2.8
merged: mbp at sourcefrog.net-20070121124213-8ksq92nrm3tzn6s9
parent: mbp at sourcefrog.net-20070121085653-ptonrp6w7ini27un
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-01-21 23:42:13 +1100
message:
Add -d option to push, pull, merge commands.
Tags now propagate between repositories by commands that move history around:
branch, push, pull, merge.
Add Repository.supports_tags method.
All Repository tag methods now raise TagsNotSupported if they're not.
------------------------------------------------------------
revno: 2220.2.7
merged: mbp at sourcefrog.net-20070121085653-ptonrp6w7ini27un
parent: mbp at sourcefrog.net-20070119084751-zcoq7c4t7yockec1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-01-21 19:56:53 +1100
message:
Add Repository.copy_tags_to
------------------------------------------------------------
revno: 2220.2.6
merged: mbp at sourcefrog.net-20070119084751-zcoq7c4t7yockec1
parent: mbp at sourcefrog.net-20070119083251-tr6zsf024kckx3lb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Fri 2007-01-19 19:47:51 +1100
message:
Add tag -r option
------------------------------------------------------------
revno: 2220.2.5
merged: mbp at sourcefrog.net-20070119083251-tr6zsf024kckx3lb
parent: mbp at sourcefrog.net-20070119083142-s0ukxl1znp363xfr
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Fri 2007-01-19 19:32:51 +1100
message:
Better TagsNotSupported message
------------------------------------------------------------
revno: 2220.2.4
merged: mbp at sourcefrog.net-20070119083142-s0ukxl1znp363xfr
parent: mbp at sourcefrog.net-20070119024650-o12ekgnjski2v3ed
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Fri 2007-01-19 19:31:42 +1100
message:
Repositories which don't support tags now give a better message
------------------------------------------------------------
revno: 2220.2.3
merged: mbp at sourcefrog.net-20070119024650-o12ekgnjski2v3ed
parent: mbp at sourcefrog.net-20070116132138-vhziz9hpfc8za0uj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Fri 2007-01-19 13:46:50 +1100
message:
Add tag: revision namespace.
Change make_tag to set_tag
Add Branch.lookup_tag (defers to Branch.lookup_tag) for simplicity of callers,
and possibly to help formats where it's better to look up by branch.
Factor out RevisionInfo.from_revision_id
Separate tag storage into a _TagStore strategy within the Repository,
so they can be reused across formats.
------------------------------------------------------------
revno: 2220.2.2
merged: mbp at sourcefrog.net-20070116132138-vhziz9hpfc8za0uj
parent: mbp at sourcefrog.net-20070114085612-q90lx2g0firzu7z9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Wed 2007-01-17 00:21:38 +1100
message:
Add tag command and basic implementation
------------------------------------------------------------
revno: 2220.2.1
merged: mbp at sourcefrog.net-20070114085612-q90lx2g0firzu7z9
parent: pqm at pqm.ubuntu.com-20070103022432-334b367262bc7407
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-01-14 19:56:12 +1100
message:
Start adding space for tags stored in the repository
------------------------------------------------------------
revno: 2255.1.53
merged: pqm at pqm.ubuntu.com-20070301065357-e0804257b4f378cf
parent: pqm at pqm.ubuntu.com-20070301033137-9b87fdf211dc2e15
parent: bialix at ukr.net-20070228183916-p1eorz33v4zxy27m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-01 06:53:57 +0000
message:
(bialix) win32: suppress IOError with errno=22 (Invalid argument)
when pipe is broken
------------------------------------------------------------
revno: 2255.1.49.2.1
merged: bialix at ukr.net-20070228183916-p1eorz33v4zxy27m
parent: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: small.fixes
timestamp: Wed 2007-02-28 20:39:16 +0200
message:
Suppress IOError with errno=22 (Invalid argument) on win32 when pipe is broken
------------------------------------------------------------
revno: 2255.1.52
merged: pqm at pqm.ubuntu.com-20070301033137-9b87fdf211dc2e15
parent: pqm at pqm.ubuntu.com-20070301031900-28686aef0de59e43
parent: aaron.bentley at utoronto.ca-20070301030830-xpgobtx029lmo57h
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-01 03:31:37 +0000
message:
Fix #85305 by issuing an exception instead of a traceback.
------------------------------------------------------------
revno: 2255.1.39.3.3
merged: aaron.bentley at utoronto.ca-20070301030830-xpgobtx029lmo57h
parent: abentley at panoramicfeedback.com-20070228214044-nz9ahj9y1lr0a65q
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Wed 2007-02-28 22:08:30 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2255.1.39.3.2
merged: abentley at panoramicfeedback.com-20070228214044-nz9ahj9y1lr0a65q
parent: v.ladeuil+lp at free.fr-20070217203103-5uepd1ux5jqvufaa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2007-02-28 16:40:44 -0500
message:
Remove trailing whitespace
------------------------------------------------------------
revno: 2255.1.39.3.1
merged: v.ladeuil+lp at free.fr-20070217203103-5uepd1ux5jqvufaa
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.85305
timestamp: Sat 2007-02-17 21:31:03 +0100
message:
Fix #85305 by issuing an exception instead of a traceback.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport.__init__): Check https support.
* bzrlib/tests/test_http.py:
(TestWithTransport_pycurl): Moved higher for reuse.
(TestHttpTransportUrls): Separated from TestHttpUrls to be applied
to both implementations (pycurl and urllib).
(TestHttpUrls_urllib, TestHttpUrls_pycurl):
------------------------------------------------------------
revno: 2255.1.51
merged: pqm at pqm.ubuntu.com-20070301031900-28686aef0de59e43
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
parent: aaron.bentley at utoronto.ca-20070301025337-ao2ls9hmiscidfg8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-01 03:19:00 +0000
message:
fix pull --overwrite, especially with bundles
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.23
merged: aaron.bentley at utoronto.ca-20070301025337-ao2ls9hmiscidfg8
parent: abentley at panoramicfeedback.com-20070228213255-gezk6m0jc3p01uf3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-02-28 21:53:37 -0500
message:
Update test case per review
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.22
merged: abentley at panoramicfeedback.com-20070228213255-gezk6m0jc3p01uf3
parent: aaron.bentley at utoronto.ca-20070216001818-rlhrzftmlaune361
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-02-28 16:32:55 -0500
message:
Fix pull --overwrite for bundles
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21
merged: aaron.bentley at utoronto.ca-20070216001818-rlhrzftmlaune361
parent: abentley at panoramicfeedback.com-20070215160031-a2tj0ie8u9v30ob9
parent: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-02-15 19:18:18 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2255.1.50
merged: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
parent: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
parent: john at arbash-meinel.com-20070228151923-1s7oa2i2kk9u9ufo
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-28 21:10:48 +0000
message:
(James Westby) Allow passing a template message to commit.
------------------------------------------------------------
revno: 2255.1.49.1.1
merged: john at arbash-meinel.com-20070228151923-1s7oa2i2kk9u9ufo
parent: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
parent: jw+debian at jameswestby.net-20070226214805-umfrbzkqnvvrna64
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-02-28 09:19:23 -0600
message:
[merge] James Westby allow passing a default message to commit
Also clean up NEWS a bit to reduce conflicts and conform to rST.
------------------------------------------------------------
revno: 2255.1.3.3.4
merged: jw+debian at jameswestby.net-20070226214805-umfrbzkqnvvrna64
parent: jw+debian at jameswestby.net-20070205235821-09fbu7wbof8xc9k8
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Mon 2007-02-26 21:48:05 +0000
message:
Make the handling of the msgfile more sane.
* Close it in a finally block for more safety.
* Open it at the start and just write to it instead of building up the
message.
* Don't close the fileno from mkstemp, just convert it to a filehandle
straight away.
------------------------------------------------------------
revno: 2255.1.3.3.3
merged: jw+debian at jameswestby.net-20070205235821-09fbu7wbof8xc9k8
parent: jw+debian at jameswestby.net-20070204215850-64v3uwm4lc906nyy
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Mon 2007-02-05 23:58:21 +0000
message:
Refactor again from John and Alexander's comments.
------------------------------------------------------------
revno: 2255.1.3.3.2
merged: jw+debian at jameswestby.net-20070204215850-64v3uwm4lc906nyy
parent: jw+debian at jameswestby.net-20070203135827-15twzpv89r1uygks
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Sun 2007-02-04 21:58:50 +0000
message:
Allow an empty start message.
Following comments from Robert the start_message is now allowed to be empty.
The tests are also split out more.
------------------------------------------------------------
revno: 2255.1.3.3.1
merged: jw+debian at jameswestby.net-20070203135827-15twzpv89r1uygks
parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Sat 2007-02-03 13:58:27 +0000
message:
Add a way to specify a template commit message.
Add start_message to the edit_commit_message function. This adds the text
above the separator so that it will not be removed after the user has edited.
Allows a template commit message to be specified. It however does nothing to
make it easy to actually hook in and set that.
------------------------------------------------------------
revno: 2255.1.49
merged: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
parent: pqm at pqm.ubuntu.com-20070227220846-8cce3b2986915092
parent: bialix at ukr.net-20070227221207-icy06420x3b0ceyf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-28 06:56:54 +0000
message:
(biaklix) bzr init works with non-ascii location (#85599)
------------------------------------------------------------
revno: 2255.1.39.2.2
merged: bialix at ukr.net-20070227221207-icy06420x3b0ceyf
parent: bialix at ukr.net-20070217071147-pc4zm6d4rc8zqv77
parent: pqm at pqm.ubuntu.com-20070227210131-478bc8c5f83bd5dc
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: init.non.ascii
timestamp: Wed 2007-02-28 00:12:07 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2255.1.39.2.1
merged: bialix at ukr.net-20070217071147-pc4zm6d4rc8zqv77
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: init.non.ascii
timestamp: Sat 2007-02-17 09:11:47 +0200
message:
Bugfix #85599: ``bzr init`` works with unicode argument LOCATION
------------------------------------------------------------
revno: 2255.1.48
merged: pqm at pqm.ubuntu.com-20070227220846-8cce3b2986915092
parent: pqm at pqm.ubuntu.com-20070227210131-478bc8c5f83bd5dc
parent: v.ladeuil+lp at free.fr-20070110023240-m844hew538cwg618
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-27 22:08:46 +0000
message:
Capitalize rocks output
------------------------------------------------------------
revno: 2227.4.1
merged: v.ladeuil+lp at free.fr-20070110023240-m844hew538cwg618
parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
committer: v.ladeuil+lp at free.fr
branch nick: bzr.78026
timestamp: Wed 2007-01-10 03:32:40 +0100
message:
Fix #78026.
------------------------------------------------------------
revno: 2255.1.47
merged: pqm at pqm.ubuntu.com-20070227210131-478bc8c5f83bd5dc
parent: pqm at pqm.ubuntu.com-20070227040724-41ae309eb90f4744
parent: bialix at ukr.net-20070227065737-yoon57v79cgycto6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-27 21:01:31 +0000
message:
(bialix) Searching CA bundle for PyCurl in env variable, and on win32
along the path
------------------------------------------------------------
revno: 2255.1.43.5.3
merged: bialix at ukr.net-20070227065737-yoon57v79cgycto6
parent: bialix at ukr.net-20070226202808-9t3wvwmh172lw6br
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: ca-bundle
timestamp: Tue 2007-02-27 08:57:37 +0200
message:
added comment about excluding cwd from PATH
------------------------------------------------------------
revno: 2255.1.43.5.2
merged: bialix at ukr.net-20070226202808-9t3wvwmh172lw6br
parent: bialix at ukr.net-20070226100258-weo9uj2qnf35icxp
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: ca-bundle
timestamp: Mon 2007-02-26 22:28:08 +0200
message:
Don't look in cwd for CA bundle (note from John)
------------------------------------------------------------
revno: 2255.1.43.5.1
merged: bialix at ukr.net-20070226100258-weo9uj2qnf35icxp
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: ca-bundle
timestamp: Mon 2007-02-26 12:02:58 +0200
message:
Bugfix #82086: Searching location of CA bundle for PyCurl in env variable (CURL_CA_BUNDLE), and on win32 along the PATH
------------------------------------------------------------
revno: 2255.1.46
merged: pqm at pqm.ubuntu.com-20070227040724-41ae309eb90f4744
parent: pqm at pqm.ubuntu.com-20070226201622-2f1d97a573b34d44
parent: andrew.bennetts at canonical.com-20070227022050-mop4cp2f5gf3bx9t
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-27 04:07:24 +0000
message:
(andrew,r=mbp,r=john) bzr:// defaults to port 4155
------------------------------------------------------------
revno: 2255.1.43.4.3
merged: andrew.bennetts at canonical.com-20070227022050-mop4cp2f5gf3bx9t
parent: andrew.bennetts at canonical.com-20070227004247-ow9tmwdw9lufkhi6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: default-port
timestamp: Tue 2007-02-27 13:20:50 +1100
message:
Use a BZR_DEFAULT_PORT constant instead of bare 4155.
------------------------------------------------------------
revno: 2255.1.43.4.2
merged: andrew.bennetts at canonical.com-20070227004247-ow9tmwdw9lufkhi6
parent: andrew.bennetts at canonical.com-20070226092026-d56e1sqtimfkd5zt
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: default-port
timestamp: Tue 2007-02-27 11:42:47 +1100
message:
Add NEWS entry.
------------------------------------------------------------
revno: 2255.1.43.4.1
merged: andrew.bennetts at canonical.com-20070226092026-d56e1sqtimfkd5zt
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: default-port
timestamp: Mon 2007-02-26 20:20:26 +1100
message:
Give bzr:// a default port of 4155.
------------------------------------------------------------
revno: 2255.1.45
merged: pqm at pqm.ubuntu.com-20070226201622-2f1d97a573b34d44
parent: pqm at pqm.ubuntu.com-20070226085224-84d4ff0445f116f8
parent: john at arbash-meinel.com-20070226183328-v83bgfqwxlwp6kem
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-02-26 20:16:22 +0000
message:
(Jonathan Lange) Change the import order for plugins, to prefer user dirs.
------------------------------------------------------------
revno: 2255.1.43.2.1
merged: john at arbash-meinel.com-20070226183328-v83bgfqwxlwp6kem
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: jml at canonical.com-20070223060654-hna3q6wwljswnkh3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-02-26 12:33:28 -0600
message:
(Jonathan Lange) Change the import order for plugins, to prefer user dirs.
------------------------------------------------------------
revno: 2255.1.43.3.1
merged: jml at canonical.com-20070223060654-hna3q6wwljswnkh3
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: jml at canonical.com
branch nick: bzr.plugin-path
timestamp: Fri 2007-02-23 17:06:54 +1100
message:
Make set_plugins_path search user-specified directories (BZR_PLUGIN_PATH
or get_default_plugin_path()) before searching in site-wide directories
(dirname(bzrlib.plugins.__file__)).
------------------------------------------------------------
revno: 2255.1.44
merged: pqm at pqm.ubuntu.com-20070226085224-84d4ff0445f116f8
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: mbp at sourcefrog.net-20070226044016-hp3hp0yitdt7krph
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-02-26 08:52:24 +0000
message:
(mbp,r=aaron) tests for merge_modified
------------------------------------------------------------
revno: 2255.1.43.1.1
merged: mbp at sourcefrog.net-20070226044016-hp3hp0yitdt7krph
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2007-02-26 15:40:16 +1100
message:
Add test for merge_modified
Diff too large for email (4419, the limit is 1000).
More information about the bazaar-commits
mailing list