Rev 2214: Merge rename-SmartTransport branch. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/
Andrew Bennetts
andrew.bennetts at canonical.com
Fri Apr 13 06:51:57 BST 2007
At sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/
------------------------------------------------------------
revno: 2214
revision-id: andrew.bennetts at canonical.com-20070413054830-3kb1ryz3yiwo7vpv
parent: andrew.bennetts at canonical.com-20070413015712-lvj50btwcb4k6w3i
parent: andrew.bennetts at canonical.com-20070413051536-omtgid0zygdfbvra
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 15:48:30 +1000
message:
Merge rename-SmartTransport branch.
added:
bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/workingtree_implementations/test_get_file_mtime.py test_get_file_mtime.-20070411212918-dhentj8gk0hsu54z-1
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/tree_implementations/test_get_file_mtime.py test_get_file_mtime.-20070301003805-kjkpwfp4whbm39o1-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.33
merged: andrew.bennetts at canonical.com-20070413051536-omtgid0zygdfbvra
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: rename-SmartTransport
timestamp: Fri 2007-04-13 15:15:36 +1000
message:
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32
merged: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
parent: pqm at pqm.ubuntu.com-20070412141938-72ysaak1x6brlfmm
parent: john at arbash-meinel.com-20070412143944-w1tdz5wvpaf6791p
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 16:03:56 +0100
message:
(Ian Clatworthy) Help text fixes for add, commit, and export
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.66.1.2
merged: john at arbash-meinel.com-20070412143944-w1tdz5wvpaf6791p
parent: john at arbash-meinel.com-20070322190703-qx2xft42j64hfp88
parent: ian.clatworthy at internode.on.net-20070412060957-m8l5xx0cte108s3d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-04-12 09:39:44 -0500
message:
(Ian Clatworthy) Help text fixes for add, commit, and export
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.69.1.6
merged: ian.clatworthy at internode.on.net-20070412060957-m8l5xx0cte108s3d
parent: ian.clatworthy at internode.on.net-20070412060105-p8xvixkc0or94nxp
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.help-fixes
timestamp: Thu 2007-04-12 16:09:57 +1000
message:
explained selected fail commit failure by design
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.69.1.5
merged: ian.clatworthy at internode.on.net-20070412060105-p8xvixkc0or94nxp
parent: ian.clatworthy at internode.on.net-20070402011840-ad1dombhee1vr88x
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.help-fixes
timestamp: Thu 2007-04-12 16:01:05 +1000
message:
explained selected fail commit failure by design
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.69.1.4
merged: ian.clatworthy at internode.on.net-20070402011840-ad1dombhee1vr88x
parent: ian.clatworthy at internode.on.net-20070329091803-1774b7u9isk2z0p4
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.quick
timestamp: Mon 2007-04-02 11:18:40 +1000
message:
Include feedback from mailing list.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.69.1.3
merged: ian.clatworthy at internode.on.net-20070329091803-1774b7u9isk2z0p4
parent: ian.clatworthy at internode.on.net-20070327003529-dwroi8lgq0nxouov
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.quick
timestamp: Thu 2007-03-29 19:18:03 +1000
message:
Minor man page fixes for add, commit, export
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.31
merged: pqm at pqm.ubuntu.com-20070412141938-72ysaak1x6brlfmm
parent: pqm at pqm.ubuntu.com-20070412095902-nen3rbeeppe9yrz0
parent: john at arbash-meinel.com-20070412135716-tqs9n87s9gjefkdx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 15:19:38 +0100
message:
(John Arbash Meinel) Add more get_file_mtime tests.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.3.2
merged: john at arbash-meinel.com-20070412135716-tqs9n87s9gjefkdx
parent: john at arbash-meinel.com-20070411221459-h6l619a85w7nimfc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_file_mtime_tests
timestamp: Thu 2007-04-12 08:57:16 -0500
message:
Fix one test.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.3.1
merged: john at arbash-meinel.com-20070411221459-h6l619a85w7nimfc
parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: get_file_mtime_tests
timestamp: Wed 2007-04-11 17:14:59 -0500
message:
Add some tests for get_file_mtime, and clean up others.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.30
merged: pqm at pqm.ubuntu.com-20070412095902-nen3rbeeppe9yrz0
parent: pqm at pqm.ubuntu.com-20070412093242-8r2pilxsjtxs46dj
parent: andrew.bennetts at canonical.com-20070412092148-bg68kyofc8k702yf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 10:59:02 +0100
message:
Link to HACKING.htm from doc/index.txt.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.2.3
merged: andrew.bennetts at canonical.com-20070412092148-bg68kyofc8k702yf
parent: andrew.bennetts at canonical.com-20070411104619-f9hdzo9s4p63je91
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: HACKING-portability
timestamp: Thu 2007-04-12 19:21:48 +1000
message:
Link to HACKING.htm from doc/index.txt.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.29
merged: pqm at pqm.ubuntu.com-20070412093242-8r2pilxsjtxs46dj
parent: pqm at pqm.ubuntu.com-20070412063453-ogf089v98ktaopbk
parent: andrew.bennetts at canonical.com-20070411104619-f9hdzo9s4p63je91
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 10:32:42 +0100
message:
(Andrew Bennetts) Add a brief Portability section to HACKING, build HACKING.htm from 'make docs'.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.2.2
merged: andrew.bennetts at canonical.com-20070411104619-f9hdzo9s4p63je91
parent: andrew.bennetts at canonical.com-20070411080906-4mgvcy6focqyhl0a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: HACKING-portability
timestamp: Wed 2007-04-11 20:46:19 +1000
message:
Add a brief section on portability to HACKING.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.2.1
merged: andrew.bennetts at canonical.com-20070411080906-4mgvcy6focqyhl0a
parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: HACKING-portability
timestamp: Wed 2007-04-11 18:09:06 +1000
message:
Build HACKING.htm from 'make docs'.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.28
merged: pqm at pqm.ubuntu.com-20070412063453-ogf089v98ktaopbk
parent: pqm at pqm.ubuntu.com-20070412032019-axeg1wmcju0odfdr
parent: mbp at sourcefrog.net-20070412050145-e139sv6el1h8j243
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 07:34:53 +0100
message:
Better tag upgrade message
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.1.2.4.1.1
merged: mbp at sourcefrog.net-20070412050145-e139sv6el1h8j243
parent: mbp at sourcefrog.net-20070404012211-sq269me6bai9m6xk
parent: ian.clatworthy at internode.on.net-20070329022831-5pql3da3g87rueu2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-04-12 15:01:45 +1000
message:
Better tag upgrade message
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.1.3.1
merged: ian.clatworthy at internode.on.net-20070329022831-5pql3da3g87rueu2
parent: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.better-tag-msgs
timestamp: Thu 2007-03-29 12:28:31 +1000
message:
Better tag/tags error message (#97674)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.27
merged: pqm at pqm.ubuntu.com-20070412032019-axeg1wmcju0odfdr
parent: pqm at pqm.ubuntu.com-20070412005953-vow66znisuxhrauk
parent: john at arbash-meinel.com-20070411220839-0eyz5nrq4vv1chcb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 04:20:19 +0100
message:
(John Arbash Meinel) Fix bug #103870 by teaching show_diff_trees about modified files in renamed directories
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.1.4
merged: john at arbash-meinel.com-20070411220839-0eyz5nrq4vv1chcb
parent: john at arbash-meinel.com-20070411220516-bz4941rayeilvjac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: diff_renamed_103870
timestamp: Wed 2007-04-11 17:08:39 -0500
message:
NEWS for fixing bug #103870
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.1.3
merged: john at arbash-meinel.com-20070411220516-bz4941rayeilvjac
parent: john at arbash-meinel.com-20070411220215-o07i1rcajpghkpom
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: diff_renamed_103870
timestamp: Wed 2007-04-11 17:05:16 -0500
message:
Do a better fix, which recognizes that we should pass the correct old path.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.1.2
merged: john at arbash-meinel.com-20070411220215-o07i1rcajpghkpom
parent: john at arbash-meinel.com-20070411215736-rii53nkqb42hezup
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: diff_renamed_103870
timestamp: Wed 2007-04-11 17:02:15 -0500
message:
Fix bug #103870 by passing None instead of a (sometimes wrong) path
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24.1.1
merged: john at arbash-meinel.com-20070411215736-rii53nkqb42hezup
parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: diff_renamed_103870
timestamp: Wed 2007-04-11 16:57:36 -0500
message:
Add a bunch of direct tests for 'show_diff_trees'
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.26
merged: pqm at pqm.ubuntu.com-20070412005953-vow66znisuxhrauk
parent: pqm at pqm.ubuntu.com-20070412003351-vvhci6f1lvpelk24
parent: bialix at ukr.net-20070410124409-9ma7vrslw37ildiz
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 01:59:53 +0100
message:
(bialix,r=john) win32-related selftest improvements
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.6.4
merged: bialix at ukr.net-20070410124409-9ma7vrslw37ildiz
parent: bialix at ukr.net-20070405223343-7v14l68sicl8u8qi
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Tue 2007-04-10 15:44:09 +0300
message:
Teach `bzr selftest --clean-output` to remove read-only files (win32-specific)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.6.3
merged: bialix at ukr.net-20070405223343-7v14l68sicl8u8qi
parent: bialix at ukr.net-20070405213029-wz2erv57mbq5hm2j
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Fri 2007-04-06 01:33:43 +0300
message:
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.6.2
merged: bialix at ukr.net-20070405213029-wz2erv57mbq5hm2j
parent: bialix at ukr.net-20070328144807-dhektxjnz7axuq8j
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Fri 2007-04-06 00:30:29 +0300
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.6.1
merged: bialix at ukr.net-20070328144807-dhektxjnz7axuq8j
parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-03-28 17:48:07 +0300
message:
blackbox: test_cat_different_id: calling bzr as another process require free lock on win32
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.25
merged: pqm at pqm.ubuntu.com-20070412003351-vvhci6f1lvpelk24
parent: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
parent: andrew.bennetts at canonical.com-20070411054339-b01z0zc1bj21x16o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-12 01:33:51 +0100
message:
(Andrew Bennetts) Use repo.supports_rich_root() rather than repo._format.rich_root_data
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.24
merged: pqm at pqm.ubuntu.com-20070411044855-b83c4dc6fd093648
parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
parent: aaron.bentley at utoronto.ca-20070411041259-pfl82a4kg9q5j3n2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-11 05:48:55 +0100
message:
Fix bzr cat-revision REVISION_ID
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.18
merged: aaron.bentley at utoronto.ca-20070411041259-pfl82a4kg9q5j3n2
parent: abentley at panoramicfeedback.com-20070410210517-0m7mhl5d2fhs66u5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-04-11 00:12:59 -0400
message:
Add copyright notice
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17
merged: abentley at panoramicfeedback.com-20070410210517-0m7mhl5d2fhs66u5
parent: abentley at panoramicfeedback.com-20070410204657-nqvx7b7t2zou61gu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-10 17:05:17 -0400
message:
Move cat-revision tests out of test_revision_info
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.16
merged: abentley at panoramicfeedback.com-20070410204657-nqvx7b7t2zou61gu
parent: abentley at panoramicfeedback.com-20070405202732-f9b8pvfd1h699cd4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-04-10 16:46:57 -0400
message:
Fix cat-revision REVISION
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.15
merged: abentley at panoramicfeedback.com-20070405202732-f9b8pvfd1h699cd4
parent: aaron.bentley at utoronto.ca-20070404024116-8lm1319fn59e2eww
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-04-05 16:27:32 -0400
message:
merge bzr.dev
Diff too large for email (1123 lines, the limit is 1000).
More information about the bazaar-commits
mailing list