Rev 1648: diff and merge handle binaries safely in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Apr 19 09:42:41 BST 2006
------------------------------------------------------------
revno: 1648
revision-id: 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
added:
bzrlib/tests/test_patch.py test_patch.py-20060416172603-65c8e3b6c4783426
bzrlib/tests/test_textfile.py test_textfile.py-20060415001558-256482b2206362aa
bzrlib/textfile.py textfile.py-20060415001558-9cc2f3652ca99f97
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/patch.py patch.py-20050513021216-ad183543f56ee2e5
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
------------------------------------------------------------
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
More information about the bazaar-commits
mailing list