Rev 1680: Merge from bzr.dev. in
/home/robertc/source/baz/integration/
Robert Collins
robertc at robertcollins.net
Thu Apr 20 07:38:03 BST 2006
------------------------------------------------------------
revno: 1680
revision-id: robertc at robertcollins.net-20060420063758-3cacd9a9925a1a20
parent: robertc at robertcollins.net-20060420061105-4fd8c6ef3317fdb9
parent: pqm at pqm.ubuntu.com-20060420052645-766474fe9eefd59a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-04-20 16:37:58 +1000
message:
Merge from bzr.dev.
added:
bzrlib/tests/test_patch.py test_patch.py-20060416172603-65c8e3b6c4783426
bzrlib/tests/test_textfile.py test_textfile.py-20060415001558-256482b2206362aa
bzrlib/tests/test_textmerge.py test_textmerge.py-20060408165803-fab93ab605a78e56
bzrlib/textfile.py textfile.py-20060415001558-9cc2f3652ca99f97
bzrlib/textmerge.py textmerge.py-20060408064938-a5d5c009e64a3a25
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/patch.py patch.py-20050513021216-ad183543f56ee2e5
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060420052645-766474fe9eefd59a
parent: pqm at pqm.ubuntu.com-20060420041224-c125c2ba385d680f
parent: robertc at robertcollins.net-20060420045219-440c2336c88c5d0e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 06:26:45 +0100
message:
Really fix short-read support in tuned_gzip. The python zlib module behaved differently than thought.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060420041224-c125c2ba385d680f
parent: pqm at pqm.ubuntu.com-20060420025129-8e219a634d2d4dbc
parent: mbp at sourcefrog.net-20060420025259-faf3a2c086015d36
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 05:12:24 +0100
message:
(mbp) html manual generation
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420025259-faf3a2c086015d36
parent: mbp at sourcefrog.net-20060420025131-c042b29593764349
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:52:59 +1000
message:
Fix up urls and warnings in auto-generated documentation
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420025131-c042b29593764349
parent: mbp at sourcefrog.net-20060420024217-e7530e10e384d5dd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:51:31 +1000
message:
[patch] html manual generator (Alexander Belchenko)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060420025129-8e219a634d2d4dbc
parent: pqm at pqm.ubuntu.com-20060420022821-4337b8fa4942d8fe
parent: mbp at sourcefrog.net-20060420024217-e7530e10e384d5dd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 03:51:29 +0100
message:
(mbp) #36963, #3619, #39657, other cleanups
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420024217-e7530e10e384d5dd
parent: mbp at sourcefrog.net-20060420023721-04d8a3b015987240
parent: pqm at pqm.ubuntu.com-20060420022821-4337b8fa4942d8fe
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:42:17 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420023721-04d8a3b015987240
parent: mbp at sourcefrog.net-20060420023332-6da5e1c018e334b7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:37:21 +1000
message:
Add .hg to default ignore list
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420023332-6da5e1c018e334b7
parent: mbp at sourcefrog.net-20060420022422-aaa19eff8795bfd6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:33:32 +1000
message:
(PathsDoNotExist) review style comments
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420022422-aaa19eff8795bfd6
parent: mbp at sourcefrog.net-20060420012904-b3166df65e728801
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 12:24:22 +1000
message:
Fix up blackbox test for error on status of nonexistent files
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060420012904-b3166df65e728801
parent: mbp at sourcefrog.net-20060419072552-b7ec734f02ecd596
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-20 11:29:04 +1000
message:
Translate unknown sftp errors to PathError, no NoSuchFile
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419072552-b7ec734f02ecd596
parent: mbp at sourcefrog.net-20060419072040-98ded2cd48084027
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 17:25:52 +1000
message:
Better help for init-repo (Erik)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419072040-98ded2cd48084027
parent: mbp at sourcefrog.net-20060419071605-51207e739c997442
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 17:20:40 +1000
message:
Less alarming warning in bzr help output - just 'remember to keep backups'
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419071605-51207e739c997442
parent: mbp at sourcefrog.net-20060419062053-d09353cfdede1116
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 17:16:05 +1000
message:
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419062053-d09353cfdede1116
parent: mbp at sourcefrog.net-20060419061931-8bf1bc8344c02a09
parent: mbp at sourcefrog.net-20060419051159-856e022c4b11fcd4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 16:20:53 +1000
message:
[merge] (Malone #36963) verbose commit output
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419051159-856e022c4b11fcd4
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.36963
timestamp: Wed 2006-04-19 15:11:59 +1000
message:
verbose commit now specifically identifies modified/renamed/reparented files
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419061931-8bf1bc8344c02a09
parent: mbp at sourcefrog.net-20060419034716-2beab68d4c46415c
parent: mbp at sourcefrog.net-20060419052851-87d41b5b92793719
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 16:19:31 +1000
message:
[merge] reflow tutorial.txt (Malone #39657)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419052851-87d41b5b92793719
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.39657
timestamp: Wed 2006-04-19 15:28:51 +1000
message:
Reflow tutorial.txt to fit on 80-col screen (Malone #39657)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060419034716-2beab68d4c46415c
parent: mbp at sourcefrog.net-20060418064941-d6a8c9a334e9e7e1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-04-19 13:47:16 +1000
message:
Fix formatting of NoWorkingTree and NotLocalUrl exceptions
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060420022821-4337b8fa4942d8fe
parent: pqm at pqm.ubuntu.com-20060419084239-730ca2dccc3bea14
parent: robertc at robertcollins.net-20060420022044-da53862a0b55aa7b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-20 03:28:21 +0100
message:
Make knits the default format.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060419084239-730ca2dccc3bea14
parent: pqm at pqm.ubuntu.com-20060419083650-f26d296f90d75d88
parent: aaron.bentley at utoronto.ca-20060419021605-7f28e84382ceef4d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-19 09:42:39 +0100
message:
diff and merge handle binaries safely
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419021605-7f28e84382ceef4d
parent: aaron.bentley at utoronto.ca-20060419012336-a74d3d2ea435d15f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Tue 2006-04-18 22:16:05 -0400
message:
Apply merge review suggestions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419012336-a74d3d2ea435d15f
parent: aaron.bentley at utoronto.ca-20060416182903-32f8909367097b06
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Tue 2006-04-18 21:23:36 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416182903-32f8909367097b06
parent: aaron.bentley at utoronto.ca-20060416174914-99d5dec4eafbb923
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 14:29:03 -0400
message:
Added NEWS entry
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416174914-99d5dec4eafbb923
parent: aaron.bentley at utoronto.ca-20060416173705-32db73e58b94c4ab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 13:49:14 -0400
message:
Whitespace fixes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416173705-32db73e58b94c4ab
parent: aaron.bentley at utoronto.ca-20060416172633-4841d41fc9724d63
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 13:37:05 -0400
message:
Add copyright statements
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416172633-4841d41fc9724d63
parent: aaron.bentley at utoronto.ca-20060416163755-83754fc853ac57cb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 13:26:33 -0400
message:
Added more tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416163755-83754fc853ac57cb
parent: aaron.bentley at utoronto.ca-20060416162628-bbf5035308f34811
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 12:37:55 -0400
message:
Fixed binary handling in weave merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416162628-bbf5035308f34811
parent: aaron.bentley at utoronto.ca-20060416162046-a50698189b032755
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 12:26:28 -0400
message:
Fixed binary handling in Merge3
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416162046-a50698189b032755
parent: aaron.bentley at utoronto.ca-20060416155229-dd8b35cdc5d134ce
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 12:20:46 -0400
message:
Handle binary files for diff3 merges
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060416155229-dd8b35cdc5d134ce
parent: aaron.bentley at utoronto.ca-20060415001738-09feeab6b5ee61d1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Sun 2006-04-16 11:52:29 -0400
message:
Implemented binary file handling for diff
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060415001738-09feeab6b5ee61d1
parent: aaron.bentley at utoronto.ca-20060412045516-a3534bcfb08241f6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.binaries
timestamp: Fri 2006-04-14 20:17:38 -0400
message:
Add text_file function
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060419083650-f26d296f90d75d88
parent: pqm at pqm.ubuntu.com-20060419083108-fab2970f4575b010
parent: aaron.bentley at utoronto.ca-20060419025517-3d096c3d15d86c5b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-19 09:36:50 +0100
message:
Implement plan_merge for knits
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419025517-3d096c3d15d86c5b
parent: aaron.bentley at utoronto.ca-20060419025056-3847eb042f075760
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 22:55:17 -0400
message:
spacing fix
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419025056-3847eb042f075760
parent: aaron.bentley at utoronto.ca-20060419022851-f6748c7087f60284
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 22:50:56 -0400
message:
Knit plan_merge uses slices instead of xenumerate
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419022851-f6748c7087f60284
parent: aaron.bentley at utoronto.ca-20060419020851-830a65e114637604
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 22:28:51 -0400
message:
Remove unused final-section processing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419020851-830a65e114637604
parent: aaron.bentley at utoronto.ca-20060419001335-0a0be1ca65406fd6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 22:08:51 -0400
message:
Clarifications from merge review
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060419001335-0a0be1ca65406fd6
parent: aaron.bentley at utoronto.ca-20060418234234-d3d230b99ba70b9f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 20:13:35 -0400
message:
Move xenumerate to osutils
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418234234-d3d230b99ba70b9f
parent: abentley at panoramicfeedback.com-20060418134348-a1ff927ea2817900
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 19:42:34 -0400
message:
Ported weave merge test to versionedfile
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060418134348-a1ff927ea2817900
parent: aaron.bentley at utoronto.ca-20060418064459-eb09de30e77bb019
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 09:43:48 -0400
message:
Fix WeaveMerge when plan doesn't end with unchanged lines
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418064459-eb09de30e77bb019
parent: aaron.bentley at utoronto.ca-20060418001954-c50f6819b61db0b3
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Tue 2006-04-18 02:44:59 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418001954-c50f6819b61db0b3
parent: aaron.bentley at utoronto.ca-20060418001818-baae282494c418b7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 20:19:54 -0400
message:
Got plan-merge passing tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418001818-baae282494c418b7
parent: aaron.bentley at utoronto.ca-20060417235815-a697cfaf11a2ed1a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 20:18:18 -0400
message:
Update plan-merge legend
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060417235815-a697cfaf11a2ed1a
parent: aaron.bentley at utoronto.ca-20060417225954-79d47d850ef690b1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 19:58:15 -0400
message:
Identify unchanged lines correctly
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060417225954-79d47d850ef690b1
parent: aaron.bentley at utoronto.ca-20060417225911-2465ef6f4183b4fb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 18:59:54 -0400
message:
Add failing test case
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060417225911-2465ef6f4183b4fb
parent: aaron.bentley at utoronto.ca-20060417121022-ed00460ca5e81ac0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 18:59:11 -0400
message:
Added legend for plan-merge output
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060417121022-ed00460ca5e81ac0
parent: pqm at pqm.ubuntu.com-20060414013800-bd0ac9b0d1f8ba7b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.knitplanmerge
timestamp: Mon 2006-04-17 08:10:22 -0400
message:
Start work on plan_merge test
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060419083108-fab2970f4575b010
parent: pqm at pqm.ubuntu.com-20060419055038-883365ee042f9946
parent: robertc at robertcollins.net-20060419052238-b6a0d9d979cb4208
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-19 09:31:08 +0100
message:
Change the default branch format to be metadir. (Robert Collins, Aaron Bentley).
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060419055038-883365ee042f9946
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
parent: mbp at sourcefrog.net-20060418064941-d6a8c9a334e9e7e1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-19 06:50:38 +0100
message:
(mbp) two small cleanups
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060418064941-d6a8c9a334e9e7e1
parent: mbp at sourcefrog.net-20060418043844-dbaac5bdecaed3d1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-04-18 16:49:41 +1000
message:
(test_escaped_store) Avoid calling deprecated WeaveStore.get_lines method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060418043844-dbaac5bdecaed3d1
parent: mbp at sourcefrog.net-20060418004802-80796653fdb4220f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-04-18 14:38:44 +1000
message:
Clear out BRANCH.TODO - most of them are done now
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060418004802-80796653fdb4220f
parent: mbp at sourcefrog.net-20060414012652-79ef6d9d753bfe00
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-04-18 10:48:02 +1000
message:
Remove duplicate definition of option --short
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
parent: pqm at pqm.ubuntu.com-20060418052303-2170dd38c5ed278b
parent: aaron.bentley at utoronto.ca-20060418022414-28c7228e9c99bd4d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-18 06:59:25 +0100
message:
implementation of --reprocess for weave merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060418022414-28c7228e9c99bd4d
parent: aaron.bentley at utoronto.ca-20060411052153-68f838bc991e957a
parent: pqm at pqm.ubuntu.com-20060417143529-5d0dd66032fb3b23
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2006-04-17 22:24:14 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060411052153-68f838bc991e957a
parent: aaron.bentley at utoronto.ca-20060410054228-c52ef0916514c7b8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-04-11 01:21:53 -0400
message:
Moved plan_merge into Weave
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060410054228-c52ef0916514c7b8
parent: aaron.bentley at utoronto.ca-20060409003406-13704529293d6476
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2006-04-10 01:42:28 -0400
message:
Tweaks from merge review
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060409003406-13704529293d6476
parent: aaron.bentley at utoronto.ca-20060408235733-555b6583f267b843
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 20:34:06 -0400
message:
Cleanup
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408235733-555b6583f267b843
parent: aaron.bentley at utoronto.ca-20060408231927-22523ebc54811274
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 19:57:33 -0400
message:
Indicate conflicts from merge_lines, insead of guessing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408231927-22523ebc54811274
parent: aaron.bentley at utoronto.ca-20060408212236-0dde8f96083e4cc7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 19:19:27 -0400
message:
Switched TextMerge_lines to work on a list
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408212236-0dde8f96083e4cc7
parent: aaron.bentley at utoronto.ca-20060408210604-f9cc3c2fcb3c8621
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 17:22:36 -0400
message:
Renamed WeaveMerge to PlanMerge, added plan method, created planless WeaveMerge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408210604-f9cc3c2fcb3c8621
parent: aaron.bentley at utoronto.ca-20060408190033-945cb4450db553d1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 17:06:04 -0400
message:
Moved merge tests into blackbox/test_merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408190033-945cb4450db553d1
parent: aaron.bentley at utoronto.ca-20060408165812-069fc028a0cf75e5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 15:00:33 -0400
message:
Implemented reprocess for weave
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060408165812-069fc028a0cf75e5
parent: aaron.bentley at utoronto.ca-20060407233211-0bbeea55e04ad125
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2006-04-08 12:58:12 -0400
message:
Implemented two-way merge, refactored weave merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060407233211-0bbeea55e04ad125
parent: aaron.bentley at utoronto.ca-20060407232912-0f675a6b2e549f42
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-04-07 19:32:11 -0400
message:
Cleanup
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060407232912-0f675a6b2e549f42
parent: aaron.bentley at utoronto.ca-20060407223947-730e8436858d086e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-04-07 19:29:12 -0400
message:
Got weave merge producing structural output
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060407223947-730e8436858d086e
parent: aaron.bentley at utoronto.ca-20060405005914-590c2fd9ca967bf4
parent: aaron.bentley at utoronto.ca-20060407120040-1c73629500df0d87
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-04-07 18:39:47 -0400
message:
Merge from bzr.ab.integration
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060418052303-2170dd38c5ed278b
parent: pqm at pqm.ubuntu.com-20060418043515-cdbba05ac7d4b594
parent: robertc at robertcollins.net-20060418050830-ec8a43605cbc2b32
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-18 06:23:03 +0100
message:
Fix and test upgrades from bzrdir 6 over SFTP.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060418043515-cdbba05ac7d4b594
parent: pqm at pqm.ubuntu.com-20060417143529-5d0dd66032fb3b23
parent: robertc at robertcollins.net-20060418042252-d0cad40d7c5dcb6a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-18 05:35:15 +0100
message:
Fix race condition between end of stream and end of file with tuned_gzip.
More information about the bazaar-commits
mailing list