Rev 1903: (john) external diff fixes (#54651) in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Aug 1 08:33:19 BST 2006
------------------------------------------------------------
revno: 1903
revision-id: pqm at pqm.ubuntu.com-20060801073318-1e91a2ca9073f815
parent: pqm at pqm.ubuntu.com-20060801061040-2f3d87b801bc8c97
parent: mbp at sourcefrog.net-20060801062349-f68c7a538bd68855
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-08-01 08:33:18 +0100
message:
(john) external diff fixes (#54651)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060801062349-f68c7a538bd68855
parent: mbp at sourcefrog.net-20060801054240-4f5cde0964fc5119
parent: pqm at pqm.ubuntu.com-20060801061040-2f3d87b801bc8c97
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.merge.54651
timestamp: Tue 2006-08-01 16:23:49 +1000
message:
Try again to fix NEWS conflicts
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060801054240-4f5cde0964fc5119
parent: pqm at pqm.ubuntu.com-20060731162915-b2972d4eb057407a
parent: john at arbash-meinel.com-20060731191800-2204a749bee1b508
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.merge.54651
timestamp: Tue 2006-08-01 15:42:40 +1000
message:
[merge] john's external-diff fix
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731191800-2204a749bee1b508
parent: john at arbash-meinel.com-20060731191536-ca772e434471e8cf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: external-diff-54651
timestamp: Mon 2006-07-31 14:18:00 -0500
message:
Update NEWS for fixing bug #52930 and bug #54651
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731191536-ca772e434471e8cf
parent: john at arbash-meinel.com-20060731191419-41f78a5c1a394c17
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: external-diff-54651
timestamp: Mon 2006-07-31 14:15:36 -0500
message:
internal_diff always adds a trailing \n, make sure external_diff does too
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731191419-41f78a5c1a394c17
parent: john at arbash-meinel.com-20060731185811-a9976f50e047fc03
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: external-diff-54651
timestamp: Mon 2006-07-31 14:14:19 -0500
message:
Always buffer the output of diff, so we can check if retcode==2 is because of Binary files
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731185811-a9976f50e047fc03
parent: john at arbash-meinel.com-20060731184154-1d0a9110ebc2c82b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: external-diff-54651
timestamp: Mon 2006-07-31 13:58:11 -0500
message:
Just swallow a return code of 2
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731184154-1d0a9110ebc2c82b
parent: john at arbash-meinel.com-20060731182137-33f7972ede182353
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: external-diff-54651
timestamp: Mon 2006-07-31 13:41:54 -0500
message:
Update NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731182137-33f7972ede182353
parent: john at arbash-meinel.com-20060731175940-272658a5e2e4539d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: external-diff-54651
timestamp: Mon 2006-07-31 13:21:37 -0500
message:
Add a test that we can use an external diff program.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060731175940-272658a5e2e4539d
parent: pqm at pqm.ubuntu.com-20060731045248-d2a1c838e7fcfc6a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: external-diff-54651
timestamp: Mon 2006-07-31 12:59:40 -0500
message:
Fix the bug in the NoDiff exception class, and add a test
More information about the bazaar-commits
mailing list