Robert Collins
robertc at robertcollins.net
Thu Nov 3 10:08:27 CST 2005
------------------------------------------------------------
revno: 1401
revision-id: robertc at robertcollins.net-20051103160817-ce8f8dbaafab2a22
parent: robertc at robertcollins.net-20051030235846-fda8b626748cce52
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-03 11:08:17 -0500
message:
Merge from Martin.
renamed:
bzr-man.py => bzr_man.py bzrman.py-20050601153041-0ff7f74de456d15e
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/selftest/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/selftest/blackbox.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/selftest/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/selftest/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/selftest/testdiff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/selftest/testfetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/selftest/testgraph.py testgraph.py-20050905070950-42e6c958106610fd
bzrlib/selftest/testrevision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/selftest/teststatus.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/selftest/teststore.py teststore.py-20050826022702-f6caadb647395769
bzrlib/selftest/treeshape.py treeshape.py-20051004094628-312a98f0194306a8
bzrlib/store/compressed_text.py compressed_text_store.py-20050915193447-e643128846816ac1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
contrib/zsh/_bzr _bzr-20050503074841-b2f107964e03958e
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
parent: mbp at sourcefrog.net-20051031204026-5ccf0105c365b913
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 15:52:50 -0500
message:
Fix up assert with sideeffects in CompressedTextStore._copy_one
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031204026-5ccf0105c365b913
parent: mbp at sourcefrog.net-20051031172115-86efd5e038c8777d
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 15:40:26 -0500
message:
Remove all assert statements from test cases.
Tests should always be evaluated even when run with 'python -O', and so should
use TestCase.assert_ etc.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031172115-86efd5e038c8777d
parent: mbp at sourcefrog.net-20051031172011-b7cecd0b3435944a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 12:21:15 -0500
message:
Bump version to 0.7pre
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031172011-b7cecd0b3435944a
parent: mbp at sourcefrog.net-20051031171704-4e16f11e8135aeff
parent: larstiq at larstiq.dyndns.org-20051028203032-94a016293d15f207
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 12:20:11 -0500
message:
[merge] build and install manpage
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028203032-94a016293d15f207
parent: larstiq at larstiq.dyndns.org-20051028202320-9664a5530b91b23c
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 22:30:32 +0200
message:
Add reinvocation code to ensure setup.py is run by python2.4
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028202320-9664a5530b91b23c
parent: larstiq at larstiq.dyndns.org-20051028201251-d3015a1cf8ec0420
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 22:23:20 +0200
message:
bump version to 0.6
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028201251-d3015a1cf8ec0420
parent: larstiq at larstiq.dyndns.org-20051028193513-4e2c5316dba6c217
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 22:12:51 +0200
message:
Create bzr.1 manpage from setup.py
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028193513-4e2c5316dba6c217
parent: larstiq at larstiq.dyndns.org-20051028192845-2ca20eec675cddb8
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 21:35:13 +0200
message:
Kill the python reinvocation, it doesn't work for me, and
it's moving to be imported from setup.py
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028192845-2ca20eec675cddb8
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 21:28:45 +0200
message:
Eliminate double whitespace lines in manpage, reported by liw
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031171704-4e16f11e8135aeff
parent: mbp at sourcefrog.net-20051031133705-7216138f826218cd
parent: robertc at robertcollins.net-20051030235846-fda8b626748cce52
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 12:17:04 -0500
message:
[merge] robert
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031133705-7216138f826218cd
parent: mbp at sourcefrog.net-20051031131752-937c2ac79930eb6c
parent: steve at borho.org-20051031155052-c771ab6189cd2691
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 08:37:05 -0500
message:
[merge] zsh improvements (Steve Borho)
------------------------------------------------------------
merged: steve at borho.org-20051031155052-c771ab6189cd2691
parent: steve at borho.org-20051031062521-a655b2f5cc24eec2
committer: Steve Borho <steve at borho.org>
timestamp: Mon 2005-10-31 09:50:52 -0600
message:
Protect against error messages when not inside a branch
------------------------------------------------------------
merged: steve at borho.org-20051031062521-a655b2f5cc24eec2
parent: steve at borho.org-20051029142439-1d227ee477827410
committer: Steve Borho <steve at borho.org>
timestamp: Mon 2005-10-31 00:25:21 -0600
message:
Fixed spelling of detritus in clean-tree completion function
------------------------------------------------------------
merged: steve at borho.org-20051029142439-1d227ee477827410
parent: steve at borho.org-20051028193443-3247785118d72ad6
committer: Steve Borho <steve at borho.org>
timestamp: Sat 2005-10-29 09:24:39 -0500
message:
Added zsh completions for common plugins
------------------------------------------------------------
merged: steve at borho.org-20051028193443-3247785118d72ad6
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Steve Borho <steve at borho.org>
timestamp: Fri 2005-10-28 14:34:43 -0500
message:
zsh completions updated for bzr 0.6
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031131752-937c2ac79930eb6c
parent: mbp at sourcefrog.net-20051031123645-20ecc5dd9337fb90
parent: robertc at robertcollins.net-20051024140519-8c20eb83b8981c05
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 08:17:52 -0500
message:
[merge] upgrade fix
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031123645-20ecc5dd9337fb90
parent: mbp at sourcefrog.net-20051031120610-da41deafd12fdbb8
parent: jelmer at samba.org-20051030171629-f0af39611b2a072c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 07:36:45 -0500
message:
[merge] fix sftp selftest and parsing of passwords in sftp urls
------------------------------------------------------------
merged: jelmer at samba.org-20051030171629-f0af39611b2a072c
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Sun 2005-10-30 18:16:29 +0100
message:
Parse passwords in sftp URLs (sftp://foo:bar@localhost/).
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031120610-da41deafd12fdbb8
parent: mbp at sourcefrog.net-20051031120304-2dcdacfc04b814d8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 07:06:10 -0500
message:
[patch] 'bzr init DIR' (John)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031120304-2dcdacfc04b814d8
parent: mbp at sourcefrog.net-20051028072011-e5f623cec5769d4e
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 07:03:04 -0500
message:
Remove duplicated NEWS entry
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051028072011-e5f623cec5769d4e
parent: mbp at sourcefrog.net-20051028055627-b80f0d7d43d07407
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-28 17:20:11 +1000
message:
Set logger level depending on BZR_DEBUG to reduce work
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051028055627-b80f0d7d43d07407
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-28 15:56:27 +1000
message:
0.6 release
More information about the bazaar-commits
mailing list