Rev 1850: (jam) Updates to bundles, handle binary files,
non integer timezone offsets,
and sftp pull in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Jul 11 01:28:35 BST 2006
------------------------------------------------------------
revno: 1850
revision-id: pqm at pqm.ubuntu.com-20060711002834-437bd17f804929ad
parent: pqm at pqm.ubuntu.com-20060711002203-adab6e1d8f36bd9e
parent: john at arbash-meinel.com-20060710235051-1b84cec91844d4f8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-07-11 01:28:34 +0100
message:
(jam) Updates to bundles, handle binary files, non integer timezone offsets, and sftp pull
modified:
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
merged: john at arbash-meinel.com-20060710235051-1b84cec91844d4f8
parent: john at arbash-meinel.com-20060710234835-b266e9cc6e4cf685
parent: john at arbash-meinel.com-20060710210136-3134b066b8f90aba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle-fixes
timestamp: Mon 2006-07-10 18:50:51 -0500
message:
[merge] bundle fixes for binary files with \r
------------------------------------------------------------
merged: john at arbash-meinel.com-20060710210136-3134b066b8f90aba
parent: pqm at pqm.ubuntu.com-20060710203006-17445a0e4b07b070
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle-binaries
timestamp: Mon 2006-07-10 16:01:36 -0500
message:
fix bug in bundle handling of binary files with just '\r' in them.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060710234835-b266e9cc6e4cf685
parent: john at arbash-meinel.com-20060710232241-7821db1c76587229
parent: pqm at pqm.ubuntu.com-20060710203006-17445a0e4b07b070
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle-fixes
timestamp: Mon 2006-07-10 18:48:35 -0500
message:
[merge] bzr.dev 1848
------------------------------------------------------------
merged: john at arbash-meinel.com-20060710232241-7821db1c76587229
parent: john at arbash-meinel.com-20060710231207-5473937e864b14a3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle-fixes
timestamp: Mon 2006-07-10 18:22:41 -0500
message:
Cleanup unpack_highres_date from Aaron's suggestions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060710231207-5473937e864b14a3
parent: john at arbash-meinel.com-20060710153830-b515e004e3cf2848
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle-fixes
timestamp: Mon 2006-07-10 18:12:07 -0500
message:
Remove debugging mutter() calls
------------------------------------------------------------
merged: john at arbash-meinel.com-20060710153830-b515e004e3cf2848
parent: john at arbash-meinel.com-20060710151540-81ad659edf6391c0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle-fixes
timestamp: Mon 2006-07-10 10:38:30 -0500
message:
Add a test to timezone for non integer tz offsets
------------------------------------------------------------
merged: john at arbash-meinel.com-20060710151540-81ad659edf6391c0
parent: john at arbash-meinel.com-20060709070901-f39f56fc35695ed9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle-fixes
timestamp: Mon 2006-07-10 10:15:40 -0500
message:
Removed duplicated highres date code.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060709070901-f39f56fc35695ed9
parent: john at arbash-meinel.com-20060709070345-e0e4f7ebb679f009
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle-fixes
timestamp: Sun 2006-07-09 02:09:01 -0500
message:
Properly handle non-hour timezone offsets.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060709070345-e0e4f7ebb679f009
parent: john at arbash-meinel.com-20060707160616-4ede52d0be9d5e45
parent: john at arbash-meinel.com-20060707164138-f3b923459bc2e9fa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle-fixes
timestamp: Sun 2006-07-09 02:03:45 -0500
message:
Handle SFTP exceptions
------------------------------------------------------------
merged: john at arbash-meinel.com-20060707164138-f3b923459bc2e9fa
parent: john at arbash-meinel.com-20060707160616-4ede52d0be9d5e45
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle-fixes
timestamp: Fri 2006-07-07 11:41:38 -0500
message:
Handle the SFTP exception that you can't read() from the result of get() to a dir
------------------------------------------------------------
merged: john at arbash-meinel.com-20060707160616-4ede52d0be9d5e45
parent: john at arbash-meinel.com-20060622182425-6f45cb7acd587216
parent: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle-fixes
timestamp: Fri 2006-07-07 11:06:16 -0500
message:
[merge] bzr.dev 1843
More information about the bazaar-commits
mailing list