Rev 2489: Merge bzr.dev. in http://bazaar.launchpad.net/~bzr/bzr/dirstate
Robert Collins
robertc at robertcollins.net
Wed Mar 7 01:18:38 GMT 2007
At http://bazaar.launchpad.net/~bzr/bzr/dirstate
------------------------------------------------------------
revno: 2489
revision-id: robertc at robertcollins.net-20070307011411-0cmmc8atx67v3nv7
parent: john at arbash-meinel.com-20070307010431-xjvtqmf6aqeyosy1
parent: pqm at pqm.ubuntu.com-20070306155943-73eafa9adb83ea73
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-03-07 12:14:11 +1100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/globbing.py glob.py-20061113075651-q63o2v35fm2ydk9x-1
bzrlib/ignores.py ignores.py-20060712153832-2von9l0t7p43ixsv-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
bzrlib/tests/test_globbing.py test_glob.py-20061113075651-q63o2v35fm2ydk9x-2
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_ignores.py test_ignores.py-20060712172354-vqq9ln0t8di27v53-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/smart.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
------------------------------------------------------------
revno: 2255.1.43.1.23
merged: pqm at pqm.ubuntu.com-20070306155943-73eafa9adb83ea73
parent: pqm at pqm.ubuntu.com-20070306152511-aa137bb63d6e3a62
parent: john at arbash-meinel.com-20070306154347-ilhp9u2chs2nxm3b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-06 15:59:43 +0000
message:
(John Arbash Meinel) Change safe_*_id to issue a deprecation warning, and clean up places that were still generating unicode ids.
------------------------------------------------------------
revno: 2255.1.43.1.11.4.14
merged: john at arbash-meinel.com-20070306154347-ilhp9u2chs2nxm3b
parent: john at arbash-meinel.com-20070306153636-hwdhiuapirt7p00q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Tue 2007-03-06 09:43:47 -0600
message:
The parameter is 'conflict_path' not 'conflict_file_path'
------------------------------------------------------------
revno: 2255.1.43.1.11.4.13
merged: john at arbash-meinel.com-20070306153636-hwdhiuapirt7p00q
parent: john at arbash-meinel.com-20070306151218-b8ucoudmtdy5ls0m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Tue 2007-03-06 09:36:36 -0600
message:
Conflicts go through Stanza so the need to be aware of utf8 versus unicode file ids.
------------------------------------------------------------
revno: 2255.1.43.1.11.4.12
merged: john at arbash-meinel.com-20070306151218-b8ucoudmtdy5ls0m
parent: john at arbash-meinel.com-20070302192706-7npsqodk033g21al
parent: pqm at pqm.ubuntu.com-20070306114711-2175c71920d9299c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Tue 2007-03-06 09:12:18 -0600
message:
[merge] bzr.dev 2319
(broken) Conflicts generate unicode file ids, will fix in next commit.
------------------------------------------------------------
revno: 2255.1.43.1.11.4.11
merged: john at arbash-meinel.com-20070302192706-7npsqodk033g21al
parent: john at arbash-meinel.com-20070302185900-8wyh1uzo0tlbupx7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 13:27:06 -0600
message:
Change Branch5._gen_revision_history() to be a bit faster about reading all revisions.
------------------------------------------------------------
revno: 2255.1.43.1.11.4.10
merged: john at arbash-meinel.com-20070302185900-8wyh1uzo0tlbupx7
parent: john at arbash-meinel.com-20070302171917-e2x26bl23cetyxw1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 12:59:00 -0600
message:
(fixed) Fix the last few tests that were explicitly passing around unicode ids
------------------------------------------------------------
revno: 2255.1.43.1.11.4.9
merged: john at arbash-meinel.com-20070302171917-e2x26bl23cetyxw1
parent: john at arbash-meinel.com-20070302171052-yn19ifc2f323tvqs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 11:19:17 -0600
message:
WorkingTree.merged_modified() needs to switch back to utf8 file ids.
And AddCustomIDAction should also be generating utf8 ids.
------------------------------------------------------------
revno: 2255.1.43.1.11.4.8
merged: john at arbash-meinel.com-20070302171052-yn19ifc2f323tvqs
parent: john at arbash-meinel.com-20070302170940-52wmugtm01zpzma2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 11:10:52 -0600
message:
TextStores don't require Unicode file_ids anymore. test_a passes
------------------------------------------------------------
revno: 2255.1.43.1.11.4.7
merged: john at arbash-meinel.com-20070302170940-52wmugtm01zpzma2
parent: john at arbash-meinel.com-20070302165124-pzxf42224e9j7ju2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 11:09:40 -0600
message:
Update VersionedFile tests to ensure that they can take Unicode,
but issue a warning when doing so.
------------------------------------------------------------
revno: 2255.1.43.1.11.4.6
merged: john at arbash-meinel.com-20070302165124-pzxf42224e9j7ju2
parent: john at arbash-meinel.com-20070302164035-sicgpxj3u88arycc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 10:51:24 -0600
message:
Update the 'escaped store' tests to use both unicode and utf8 file ids.
------------------------------------------------------------
revno: 2255.1.43.1.11.4.5
merged: john at arbash-meinel.com-20070302164035-sicgpxj3u88arycc
parent: john at arbash-meinel.com-20070302163503-8z3knxzmkzsqmogw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 10:40:35 -0600
message:
Change bundle_data to use the sanitizing form of safe_*_id
------------------------------------------------------------
revno: 2255.1.43.1.11.4.4
merged: john at arbash-meinel.com-20070302163503-8z3knxzmkzsqmogw
parent: john at arbash-meinel.com-20070302161948-63n53irxqf5f72dp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 10:35:03 -0600
message:
Change what warnings are raised, and add tests that they are used.
------------------------------------------------------------
revno: 2255.1.43.1.11.4.3
merged: john at arbash-meinel.com-20070302161948-63n53irxqf5f72dp
parent: john at arbash-meinel.com-20070302160657-acwr7ptaigpwawle
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 10:19:48 -0600
message:
(broken) change safe_*_id to emit a warning.
This causes lots of tests to start failing.
------------------------------------------------------------
revno: 2255.1.43.1.11.4.2
merged: john at arbash-meinel.com-20070302160657-acwr7ptaigpwawle
parent: john at arbash-meinel.com-20070302155652-d64161mcg1rybs1o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 10:06:57 -0600
message:
Change iter_entries_by_dir to avoid extra file id safety checks.
------------------------------------------------------------
revno: 2255.1.43.1.11.4.1
merged: john at arbash-meinel.com-20070302155652-d64161mcg1rybs1o
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
parent: john at arbash-meinel.com-20070302152321-hgsk2328bwgi1e6g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: unicode_id_warnings
timestamp: Fri 2007-03-02 09:56:52 -0600
message:
[merge] iter_entries_by_dir fix
------------------------------------------------------------
revno: 2255.1.43.1.22
merged: pqm at pqm.ubuntu.com-20070306152511-aa137bb63d6e3a62
parent: pqm at pqm.ubuntu.com-20070306114711-2175c71920d9299c
parent: john at arbash-meinel.com-20070306144324-6kl9fhww8x8m690s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-06 15:25:11 +0000
message:
(Kent Gibson) Normalize ignore patterns to avoid problems with path seperators.
------------------------------------------------------------
revno: 2255.1.43.1.21.1.1
merged: john at arbash-meinel.com-20070306144324-6kl9fhww8x8m690s
parent: pqm at pqm.ubuntu.com-20070306114711-2175c71920d9299c
parent: warthog618 at gmail.com-20070305232108-r9dnnjjsruycxon3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-03-06 08:43:24 -0600
message:
(Kent Gibson) Normalize ignore patterns to avoid problems with path seperators.
------------------------------------------------------------
revno: 2255.1.43.8.4
merged: warthog618 at gmail.com-20070305232108-r9dnnjjsruycxon3
parent: warthog618 at gmail.com-20070302075441-m5ek2v3j6z5gti2m
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp86451b
timestamp: Tue 2007-03-06 08:21:08 +0900
message:
Fix whitespace and alignment.
------------------------------------------------------------
revno: 2255.1.43.8.3
merged: warthog618 at gmail.com-20070302075441-m5ek2v3j6z5gti2m
parent: warthog618 at gmail.com-20070302003438-c9ju53dq662l0edr
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp86451b
timestamp: Fri 2007-03-02 16:54:41 +0900
message:
Extended test cases to test bug 86451.
------------------------------------------------------------
revno: 2255.1.43.8.2
merged: warthog618 at gmail.com-20070302003438-c9ju53dq662l0edr
parent: warthog618 at gmail.com-20070301084600-mce8y9te2o548h5r
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp86451b
timestamp: Fri 2007-03-02 09:34:38 +0900
message:
Review fixes for lp86451 patch.
------------------------------------------------------------
revno: 2255.1.43.8.1
merged: warthog618 at gmail.com-20070301084600-mce8y9te2o548h5r
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lp86451b
timestamp: Thu 2007-03-01 17:46:00 +0900
message:
Normalise ignore patterns to use '/' path separator.
Also fixes bug 86451 where a trailing '\' crashes pattern matching.
Added detection and correction of trailing '\' in ignore REs that would
escape the closing bracket.
------------------------------------------------------------
revno: 2255.1.43.1.21
merged: pqm at pqm.ubuntu.com-20070306114711-2175c71920d9299c
parent: pqm at pqm.ubuntu.com-20070306003758-f693dc70e8b3706b
parent: bialix at ukr.net-20070306080508-43s3c6gz2nqikt8m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-06 11:47:11 +0000
message:
(bialix) update comment about stderr (trivial)
------------------------------------------------------------
revno: 2255.1.43.1.20.1.1
merged: bialix at ukr.net-20070306080508-43s3c6gz2nqikt8m
parent: pqm at pqm.ubuntu.com-20070306003758-f693dc70e8b3706b
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.3
timestamp: Tue 2007-03-06 10:05:08 +0200
message:
update comment about stderr (trivial)
------------------------------------------------------------
revno: 2255.1.43.1.20
merged: pqm at pqm.ubuntu.com-20070306003758-f693dc70e8b3706b
parent: pqm at pqm.ubuntu.com-20070306001952-643bf00bcf1c1160
parent: bialix at ukr.net-20070306001057-icg2bwq1pprq0wkx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-06 00:37:58 +0000
message:
(bialix,r=john) little fix for manpage generator (handling absent
help for commands options)
------------------------------------------------------------
revno: 2255.1.43.1.11.3.2
merged: bialix at ukr.net-20070306001057-icg2bwq1pprq0wkx
parent: bialix at ukr.net-20070302235316-8n8d4osjeha5c4ge
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: manpage.test
timestamp: Tue 2007-03-06 02:10:57 +0200
message:
removed implemented todo (r=john)
------------------------------------------------------------
revno: 2255.1.43.1.11.3.1
merged: bialix at ukr.net-20070302235316-8n8d4osjeha5c4ge
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
committer: "Alexander Belchenko <bialix at ukr.net>"
branch nick: manpage.test
timestamp: Sat 2007-03-03 01:53:16 +0200
message:
Fix for selftest of man generator with instaled plugin 'htmllog' (no help for plugin's log formatter)
------------------------------------------------------------
revno: 2255.1.43.1.19
merged: pqm at pqm.ubuntu.com-20070306001952-643bf00bcf1c1160
parent: pqm at pqm.ubuntu.com-20070305225859-31c72fc6c3778b82
parent: bialix at ukr.net-20070305154543-k4614opjp0z5y4w5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-06 00:19:52 +0000
message:
(bialix,r=andrew) win32-specific fixes for selftest (blackbox)
------------------------------------------------------------
revno: 2255.1.43.1.11.2.8
merged: bialix at ukr.net-20070305154543-k4614opjp0z5y4w5
parent: bialix at ukr.net-20070305153358-7e3w7roi09wu3hy6
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.3
timestamp: Mon 2007-03-05 17:45:43 +0200
message:
note about flushing stderr (suggested by Andrew)
------------------------------------------------------------
revno: 2255.1.43.1.11.2.7
merged: bialix at ukr.net-20070305153358-7e3w7roi09wu3hy6
parent: bialix at ukr.net-20070305143428-3carp6uibk6yume4
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.3
timestamp: Mon 2007-03-05 17:33:58 +0200
message:
Skip permission denied (on win32) during selftest cleanup
------------------------------------------------------------
revno: 2255.1.43.1.11.2.6
merged: bialix at ukr.net-20070305143428-3carp6uibk6yume4
parent: bialix at ukr.net-20070305143000-g5fw5i2k7ot6am2n
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.3
timestamp: Mon 2007-03-05 16:34:28 +0200
message:
bzr now use Win32 API to determine Application Data location, and don't rely solely on $APPDATA
------------------------------------------------------------
revno: 2255.1.43.1.11.2.5
merged: bialix at ukr.net-20070305143000-g5fw5i2k7ot6am2n
parent: bialix at ukr.net-20070304002813-bfca6obrj3xcqy7y
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.3
timestamp: Mon 2007-03-05 16:30:00 +0200
message:
test_bzr_connect_to_bzr_ssh: win32-compatibility
------------------------------------------------------------
revno: 2255.1.43.1.11.2.4
merged: bialix at ukr.net-20070304002813-bfca6obrj3xcqy7y
parent: bialix at ukr.net-20070304002646-tqoi7yf0b0cz400i
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.2
timestamp: Sun 2007-03-04 02:28:13 +0200
message:
SmartServerPipeStreamMedium: binary mode should be forced for media
------------------------------------------------------------
revno: 2255.1.43.1.11.2.3
merged: bialix at ukr.net-20070304002646-tqoi7yf0b0cz400i
parent: bialix at ukr.net-20070304002513-hmkxrjl39aplqr4a
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.2
timestamp: Sun 2007-03-04 02:26:46 +0200
message:
blackbox.test_mv: using safe osutils.rename instead of os.rename
------------------------------------------------------------
revno: 2255.1.43.1.11.2.2
merged: bialix at ukr.net-20070304002513-hmkxrjl39aplqr4a
parent: bialix at ukr.net-20070304001602-mhzsxzstjkxt50ao
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.2
timestamp: Sun 2007-03-04 02:25:13 +0200
message:
Python 2.5 on Windows XP produce slightly different error message (No such file)
------------------------------------------------------------
revno: 2255.1.43.1.11.2.1
merged: bialix at ukr.net-20070304001602-mhzsxzstjkxt50ao
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes.2
timestamp: Sun 2007-03-04 02:16:02 +0200
message:
flush sys.stderr before os._exit
------------------------------------------------------------
revno: 2255.1.43.1.18
merged: pqm at pqm.ubuntu.com-20070305225859-31c72fc6c3778b82
parent: pqm at pqm.ubuntu.com-20070305220713-41e023034592cca1
parent: aaron.bentley at utoronto.ca-20070305224322-1w0aqoao1hsf4o2n
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-05 22:58:59 +0000
message:
resolve auto-resolves text conflicts by default
------------------------------------------------------------
revno: 2120.7.7
merged: aaron.bentley at utoronto.ca-20070305224322-1w0aqoao1hsf4o2n
parent: abentley at panoramicfeedback.com-20070305211241-4maj27f7t9ik2vvz
parent: pqm at pqm.ubuntu.com-20070305220713-41e023034592cca1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: autoconflicts
timestamp: Mon 2007-03-05 17:43:22 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2120.7.6
merged: abentley at panoramicfeedback.com-20070305211241-4maj27f7t9ik2vvz
parent: aaron.bentley at utoronto.ca-20070303171753-o0s1yrxx5sn12p2k
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: autoconflicts
timestamp: Mon 2007-03-05 16:12:41 -0500
message:
Update NEWS
------------------------------------------------------------
revno: 2120.7.5
merged: aaron.bentley at utoronto.ca-20070303171753-o0s1yrxx5sn12p2k
parent: aaron.bentley at utoronto.ca-20070303170534-p6dy23ex94mi7d01
parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: autoconflicts
timestamp: Sat 2007-03-03 12:17:53 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2120.7.4
merged: aaron.bentley at utoronto.ca-20070303170534-p6dy23ex94mi7d01
parent: aaron.bentley at utoronto.ca-20070303162345-wn7k1x3v51372tjt
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: autoconflicts
timestamp: Sat 2007-03-03 12:05:34 -0500
message:
Fix normal resolve
------------------------------------------------------------
revno: 2120.7.3
merged: aaron.bentley at utoronto.ca-20070303162345-wn7k1x3v51372tjt
parent: aaron.bentley at utoronto.ca-20070303010918-yqbf9rc8i2vhbcz4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: autoconflicts
timestamp: Sat 2007-03-03 11:23:45 -0500
message:
Update resolve command to automatically mark conflicts as resolved
------------------------------------------------------------
revno: 2120.7.2
merged: aaron.bentley at utoronto.ca-20070303010918-yqbf9rc8i2vhbcz4
parent: aaron.bentley at utoronto.ca-20061106063617-a5f6a95a8e672320
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: autoconflicts
timestamp: Fri 2007-03-02 20:09:18 -0500
message:
Move autoresolve functionality to workingtree
------------------------------------------------------------
revno: 2120.7.1
merged: aaron.bentley at utoronto.ca-20061106063617-a5f6a95a8e672320
parent: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: autoconflicts
timestamp: Mon 2006-11-06 01:36:17 -0500
message:
Add auto-resolve support to commit
------------------------------------------------------------
revno: 2255.1.43.1.17
merged: pqm at pqm.ubuntu.com-20070305220713-41e023034592cca1
parent: pqm at pqm.ubuntu.com-20070305202715-ac49286871b5e2a8
parent: john at arbash-meinel.com-20070305205142-3xhccyveuakkrj87
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-05 22:07:13 +0000
message:
(Vincent Ladeuil) invalid proxy vars should not cause a traceback (bug #87765)
------------------------------------------------------------
revno: 2255.1.43.1.16.1.1
merged: john at arbash-meinel.com-20070305205142-3xhccyveuakkrj87
parent: pqm at pqm.ubuntu.com-20070305202715-ac49286871b5e2a8
parent: v.ladeuil+lp at free.fr-20070225121053-eh4u4ydukn97ht9q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-05 14:51:42 -0600
message:
(Vincent Ladeuil) invalid proxy vars should not cause a traceback (bug #87765)
------------------------------------------------------------
revno: 2255.1.43.7.1
merged: v.ladeuil+lp at free.fr-20070225121053-eh4u4ydukn97ht9q
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 87765
timestamp: Sun 2007-02-25 13:10:53 +0100
message:
Fix bug #87765: proxy env variables without scheme should cause
bzr to issue traceback.
* bzrlib/tests/test_http.py:
(TestHttpProxyWhiteBox.test_invalid_proxy): New test for an proxy
not mentionning a scheme.
(TestProxyHttpServer.setUp): New attribute with the proxy raw
address.
(TestProxyHttpServer.test_http_proxy_without_scheme): New test
checking that InvalidURL is raised when an env variable specifies
no scheme.
(TestProxyHttpServer_pycurl): pycurl ignores invalid proxies,
check it in case it changes in the future.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.set_proxy): If we can't find a host in the proxy env
variable, raises InvalidURL.
------------------------------------------------------------
revno: 2255.1.43.1.16
merged: pqm at pqm.ubuntu.com-20070305202715-ac49286871b5e2a8
parent: pqm at pqm.ubuntu.com-20070304031833-38a609e7e3fb3c5b
parent: john at arbash-meinel.com-20070305201256-zajdo4xfukjkc2x7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-05 20:27:15 +0000
message:
(Johan Dahlberg) patch processor tracks current line to avoid problems with '--' lines
------------------------------------------------------------
revno: 2255.1.43.1.14.1.1
merged: john at arbash-meinel.com-20070305201256-zajdo4xfukjkc2x7
parent: pqm at pqm.ubuntu.com-20070302224952-1f19efc6c320215f
parent: johan_d at lysator.liu.se-20070303054731-8n4xac0g02tq3hkt
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-05 14:12:56 -0600
message:
(Johan Dahlberg) patch processor tracks current line to avoid problems with '--' lines
------------------------------------------------------------
revno: 2255.1.43.6.1
merged: johan_d at lysator.liu.se-20070303054731-8n4xac0g02tq3hkt
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Johan Dahlberg <johan_d at lysator.liu.se>
branch nick: bugfix75577
timestamp: Sat 2007-03-03 14:47:31 +0900
message:
Fix bzrtools shelve command for removed lines beginning with "--"
(Johan Dahlberg, bug #75577)
------------------------------------------------------------
revno: 2255.1.43.1.15
merged: pqm at pqm.ubuntu.com-20070304031833-38a609e7e3fb3c5b
parent: pqm at pqm.ubuntu.com-20070302224952-1f19efc6c320215f
parent: mbp at sourcefrog.net-20070304014718-xwe549s6zskew9hx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-04 03:18:33 +0000
message:
(mbp, trivial) Avoid false failure of test_dash_derror
------------------------------------------------------------
revno: 2255.1.43.1.10.1.1
merged: mbp at sourcefrog.net-20070304014718-xwe549s6zskew9hx
parent: pqm at pqm.ubuntu.com-20070301065357-e0804257b4f378cf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: derror
timestamp: Sun 2007-03-04 12:47:18 +1100
message:
Avoid false failure of test_dash_derror
Diff too large for email (1659 lines, the limit is 1000).
More information about the bazaar-commits
mailing list