Rev 1470: [merge] john in /home/mbp/work/bzr.dev
Martin Pool
mbp at sourcefrog.net
Mon Dec 5 12:04:41 GMT 2005
------------------------------------------------------------
revno: 1470
revision-id: mbp at sourcefrog.net-20051205120437-b6b3e28a9ea0fae5
parent: mbp at sourcefrog.net-20051205070710-70afd75c420d1901
parent: john at arbash-meinel.com-20051204215501-9ee53a39579d1e28
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 23:04:37 +1100
message:
[merge] john
added:
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_revno.py test_revno.py-20051204214528-2f0bf83a71b7656a
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_sftp.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
merged: john at arbash-meinel.com-20051204215501-9ee53a39579d1e28
parent: john at arbash-meinel.com-20051204214539-cce799161beccc33
parent: mbp at sourcefrog.net-20051202054235-ea9c5479f97c3bf6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-04 15:55:01 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051204214539-cce799161beccc33
parent: john at arbash-meinel.com-20051204214109-c8ab203540fba5df
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-04 15:45:39 -0600
message:
Forgot to add the test case
------------------------------------------------------------
merged: john at arbash-meinel.com-20051204214109-c8ab203540fba5df
parent: john at arbash-meinel.com-20051203180221-6b0304c6353a9c9c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-04 15:41:09 -0600
message:
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
Plus a test case.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051203180221-6b0304c6353a9c9c
parent: john at arbash-meinel.com-20051202171817-0ac180714e18a125
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sat 2005-12-03 12:02:21 -0600
message:
Added some extra logging when we get http exceptions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202171817-0ac180714e18a125
parent: john at arbash-meinel.com-20051202171410-3496e296756926f9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-12-02 11:18:17 -0600
message:
Changing final merge message to All changes applied successfully, rather than 0 conflicts applied.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202171410-3496e296756926f9
parent: john at arbash-meinel.com-20051202054031-273baec33b90578c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-12-02 11:14:10 -0600
message:
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202054031-273baec33b90578c
parent: john at arbash-meinel.com-20051201213142-3bf0c6acc9c5355d
parent: john at arbash-meinel.com-20051202053717-d7fd7760c548661e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2005-12-01 23:40:31 -0600
message:
[merge] Fixing port selection bug with sftp.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202053717-d7fd7760c548661e
parent: john at arbash-meinel.com-20051201013132-76797e2be4758e1c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Thu 2005-12-01 23:37:17 -0600
message:
James Henstridge confirmed that sftp.py needs self._port or 22
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201013132-76797e2be4758e1c
parent: john at arbash-meinel.com-20051201004321-67f38d47e3be46ec
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 19:31:32 -0600
message:
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201213142-3bf0c6acc9c5355d
parent: john at arbash-meinel.com-20051201211342-209492d29f37ef65
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 15:31:42 -0600
message:
[merge] Refactor NoSuchFile style exceptions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201211342-209492d29f37ef65
parent: john at arbash-meinel.com-20051201164205-77a96ba84f3085f8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 15:13:42 -0600
message:
Don't import ui_factory directly, in case it gets changed later.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201164205-77a96ba84f3085f8
parent: john at arbash-meinel.com-20051201154910-65a7e42375c28cbc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 10:42:05 -0600
message:
[bug 3632] Matthieu Moy- bzr cat should default to last revision
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201154910-65a7e42375c28cbc
parent: john at arbash-meinel.com-20051201152250-e794a08480d6dfa9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 09:49:10 -0600
message:
Cleanup of test_pull.py headers
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201152250-e794a08480d6dfa9
parent: john at arbash-meinel.com-20051201151922-11869ebb4993123f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 09:22:50 -0600
message:
Fix broken test from refactoring blackbox/test_pull
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201151922-11869ebb4993123f
parent: john at arbash-meinel.com-20051201145705-28071de6fbc274af
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 09:19:22 -0600
message:
Fixed a broken test from my 'push updates local working tree' fix
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201145705-28071de6fbc274af
parent: john at arbash-meinel.com-20051201013527-f890aade00ef57b9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 08:57:05 -0600
message:
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201013527-f890aade00ef57b9
parent: john at arbash-meinel.com-20051201010206-0b2476ecb6f0f9a8
parent: john at arbash-meinel.com-20051201013132-76797e2be4758e1c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2005-11-30 19:35:27 -0600
message:
[merge] fix bug where push was broken to remote trees
More information about the bazaar-commits
mailing list