Rev 1529: [merge] jam-integration in /home/mbp/work/bzr.dev
Martin Pool
mbp at sourcefrog.net
Wed Feb 1 13:17:45 GMT 2006
------------------------------------------------------------
revno: 1529
revision-id: mbp at sourcefrog.net-20060201131742-6f81ba01f409cc1a
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
parent: john at arbash-meinel.com-20060131200102-1cc580967bd9fe7b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-02-02 00:17:42 +1100
message:
[merge] jam-integration
added:
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/test_doc_generate.py test_doc_generate.py-20051224124638-88da58fc872b93ba
generate_docs.py bzrinfogen.py-20051211224525-78e7c14f2c955e55
tools/__init__.py __init__.py-20051212012857-39c9a39aa197f064
tools/doc_generate/ bzrinfogen-20051211214907-45ff5f0af3a80b32
tools/doc_generate/__init__.py __init__.py-20051211214907-df9e0e6b493553f1
tools/doc_generate/autodoc_bash_completion.py big_bash_completion.py-20051211223059-00ecfbfcc8056b78
renamed:
bzr_man.py => tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131200102-1cc580967bd9fe7b
parent: john at arbash-meinel.com-20060131155102-e943b3e4b2de830b
parent: john at arbash-meinel.com-20060131140911-3bc59456e076f236
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 14:01:02 -0600
message:
[merge] log reweave errors.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131140911-3bc59456e076f236
parent: john at arbash-meinel.com-20060130010259-39020721b61b67b1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Tue 2006-01-31 08:09:11 -0600
message:
When reweaving weaves, if texts don't match, log the differences rather than a plain assert
------------------------------------------------------------
merged: john at arbash-meinel.com-20060130010259-39020721b61b67b1
parent: john at arbash-meinel.com-20060125175627-e27c2a32c0b2bae9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Sun 2006-01-29 19:02:59 -0600
message:
cleanups suggested by Robert.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060125175627-e27c2a32c0b2bae9
parent: john at arbash-meinel.com-20060125174402-b190e69756b5a7d7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Wed 2006-01-25 11:56:27 -0600
message:
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy
------------------------------------------------------------
merged: john at arbash-meinel.com-20060125174402-b190e69756b5a7d7
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Wed 2006-01-25 11:44:02 -0600
message:
Fixing Weave.join() so that it uses the optimized path, and doesn't require Reweave for different parent order or repeated parents.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131155102-e943b3e4b2de830b
parent: john at arbash-meinel.com-20060131153347-6557db0336f7cdf1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 09:51:02 -0600
message:
Minor pep8 cleanups to previous revision
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131153347-6557db0336f7cdf1
parent: john at arbash-meinel.com-20060131145242-c2495bbc9756d9f3
parent: jblack at merconline.com-20060130054458-05b5b89478d482bc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 09:33:47 -0600
message:
[merge] James Blackwell, Hans Ulrich Niedermann: manpage fixes
------------------------------------------------------------
merged: jblack at merconline.com-20060130054458-05b5b89478d482bc
parent: jblack at merconline.com-20060130054213-e0def1bfce8612b8
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-30 00:44:58 -0500
message:
fixed news
------------------------------------------------------------
merged: jblack at merconline.com-20060130054213-e0def1bfce8612b8
parent: jblack at merconline.com-20060130043701-46ceed1e4710a352
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-30 00:42:13 -0500
message:
pep8ifying
------------------------------------------------------------
merged: jblack at merconline.com-20060130043701-46ceed1e4710a352
parent: jblack at merconline.com-20060130042608-b40dc90fc24956e0
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2006-01-29 23:37:01 -0500
message:
Merged mailine
------------------------------------------------------------
merged: jblack at merconline.com-20060130042608-b40dc90fc24956e0
parent: jblack at pluto-20051224124652-834664088ac33b20
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2006-01-29 23:26:08 -0500
message:
Fixed bzr.conf problem
------------------------------------------------------------
merged: jblack at pluto-20051224124652-834664088ac33b20
parent: jblack at pluto-20051224123724-b6110d74176a0442
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sat 2005-12-24 07:46:52 -0500
message:
Added smoke test for doc_generate
------------------------------------------------------------
merged: jblack at pluto-20051224123724-b6110d74176a0442
parent: jblack at pluto-20051212075724-c5cf07c6a7b3e750
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sat 2005-12-24 07:37:24 -0500
message:
Merged from mainline
------------------------------------------------------------
merged: jblack at pluto-20051212075724-c5cf07c6a7b3e750
parent: jblack at pluto-20051212033802-fc9c7272281121c9
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 02:57:24 -0500
message:
Fix up setup.py to call the manpage generation
------------------------------------------------------------
merged: jblack at pluto-20051212033802-fc9c7272281121c9
parent: jblack at pluto-20051212021621-a3151675c1f8a9c9
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 22:38:02 -0500
message:
NEWS file
------------------------------------------------------------
merged: jblack at pluto-20051212021621-a3151675c1f8a9c9
parent: jblack at pluto-20051212021126-a7ffba4393d3a9eb
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 21:16:21 -0500
message:
Fixing docstring for bzrhelp
------------------------------------------------------------
merged: jblack at pluto-20051212021126-a7ffba4393d3a9eb
parent: jblack at pluto-20051212012915-9b0caaaf70aeffe3
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 21:11:26 -0500
message:
Final tuning
------------------------------------------------------------
merged: jblack at pluto-20051212012915-9b0caaaf70aeffe3
parent: jblack at pluto-20051212012627-a5637b074fce751b
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 20:29:15 -0500
message:
needed __init__ in tools
------------------------------------------------------------
merged: jblack at pluto-20051212012627-a5637b074fce751b
parent: jblack at pluto-20051212010719-31777648cf2e762f
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 20:26:27 -0500
message:
Final wrapup on doc generation
------------------------------------------------------------
merged: jblack at pluto-20051212010719-31777648cf2e762f
parent: jblack at pluto-20051212003421-e2aa1fe9efd780ac
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 20:07:19 -0500
message:
Better help for doc_generate
------------------------------------------------------------
merged: jblack at pluto-20051212003421-e2aa1fe9efd780ac
parent: jblack at pluto-20051212001509-a28b6c6e9618d973
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 19:34:21 -0500
message:
Updating plan
------------------------------------------------------------
merged: jblack at pluto-20051212001509-a28b6c6e9618d973
parent: jblack at pluto-20051212000725-762c2850e04f38ca
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 19:15:09 -0500
message:
Fixing up autodoc
------------------------------------------------------------
merged: jblack at pluto-20051212000725-762c2850e04f38ca
parent: jblack at pluto-20051211235309-bbaa35713c759536
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 19:07:25 -0500
message:
Going closer to ndim
------------------------------------------------------------
merged: jblack at pluto-20051211235309-bbaa35713c759536
parent: jblack at pluto-20051211233848-1fea0a14c5c8fd59
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 18:53:09 -0500
message:
Hacked up ndim's code
------------------------------------------------------------
merged: jblack at pluto-20051211233848-1fea0a14c5c8fd59
parent: jblack at pluto-20051210014156-319193e3647d916e
parent: hun at n-dimensional.de-20051211231127-442e97a4dcd3533f
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 18:38:48 -0500
message:
- Pulling generated docs into one place, though whether bash completion is
documents is arguable....
- Bash completion generator. [Hans Ulrich Niedermann]
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211231127-442e97a4dcd3533f
parent: hun at n-dimensional.de-20051211230421-3e5789fc1fa93ead
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: ndim's improvements over jblack's bzr_man.py simplification
timestamp: Mon 2005-12-12 00:11:27 +0100
message:
more bzr-infogen docs
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211230421-3e5789fc1fa93ead
parent: hun at n-dimensional.de-20051211230150-77dc6510d8613f5f
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: ndim's improvements over jblack's bzr_man.py simplification
timestamp: Mon 2005-12-12 00:04:21 +0100
message:
rename bzr-infogen.py option -f to more standard-like -o
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211230150-77dc6510d8613f5f
parent: hun at n-dimensional.de-20051211224659-0f055c115c4dd309
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: ndim's improvements over jblack's bzr_man.py simplification
timestamp: Mon 2005-12-12 00:01:50 +0100
message:
bzr-infogen.py cosmetics
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211224659-0f055c115c4dd309
parent: hun at n-dimensional.de-20051211224136-a15b0e4b1212c520
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: bzr-help-ndim
timestamp: Sun 2005-12-11 23:46:59 +0100
message:
Implement the bzr documentation/information autogeneration plan:
* Add bzr-infogen.py script.
* Moved main() from bzrinfogen/__init__py to bzr-infogen.py where it belongs
Still missing:
* test case for autogeneration
* actual implementation of bash completion script
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211224136-a15b0e4b1212c520
parent: hun at n-dimensional.de-20051210183215-f3ee423778e7ea06
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: bzr-help-ndim
timestamp: Sun 2005-12-11 23:41:36 +0100
message:
Implement the bzr documentation/information autogeneration plan:
* Add new module bzrinfogen.
* Add bzrinfogen/__init__py which implements the infogen infrastructure.
* Add bzrinfogen/big_bash_completion.py:
Generates (unusable prototype) bash completion script from internal
information on bzr commands and options
* Moved bzr_man.py to bzrinfogen/big_man.py and ported it to the new
interface.
Still missing:
* test case for autogeneration
* actual implementation of bash completion script
------------------------------------------------------------
merged: hun at n-dimensional.de-20051210183215-f3ee423778e7ea06
parent: hun at n-dimensional.de-20051210171004-b0abbc0256065eed
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: bzr-help-ndim
timestamp: Sat 2005-12-10 19:32:15 +0100
message:
baz_man.py: factor out command list generation; add TODO list
------------------------------------------------------------
merged: hun at n-dimensional.de-20051210171004-b0abbc0256065eed
parent: jblack at pluto-20051210014156-319193e3647d916e
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: bzr-help-ndim
timestamp: Sat 2005-12-10 18:10:04 +0100
message:
Start implementing general doc generation plan:
* describe the plan
* steal some code from bzrlib.help to extract command help
* use subsections for each bzr command
* add COMMAND OVERVIEW section
* add USAGE section with a few common use cases
* remove copyright marks as I am going to sign over copyright to Canonical
------------------------------------------------------------
merged: jblack at pluto-20051210014156-319193e3647d916e
parent: jblack at pluto-20051210013541-4b1bfd42eb42584b
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 20:41:56 -0500
message:
Minor fixes to tutorial
------------------------------------------------------------
merged: jblack at pluto-20051210013541-4b1bfd42eb42584b
parent: jblack at pluto-20051210012930-d3fce189273c9fa6
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 20:35:41 -0500
message:
Fixing NEWS
------------------------------------------------------------
merged: jblack at pluto-20051210012930-d3fce189273c9fa6
parent: jblack at pluto-20051210000050-f24530fd02918c61
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 20:29:30 -0500
message:
Give long help with command on man page
------------------------------------------------------------
merged: jblack at pluto-20051210000050-f24530fd02918c61
parent: jblack at pluto-20051209234840-9f00d87c354b5c7b
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 19:00:50 -0500
message:
Marked which parts of file is owned by Hans
------------------------------------------------------------
merged: jblack at pluto-20051209234840-9f00d87c354b5c7b
parent: jblack at pluto-20051209234750-184fa848e8023670
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 18:48:40 -0500
message:
man_page.py, Canonical Ltd., not Canonical
------------------------------------------------------------
merged: jblack at pluto-20051209234750-184fa848e8023670
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
parent: hun at n-dimensional.de-20051209214826-c763355e488d6b32
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 18:47:50 -0500
message:
Update for .bazaar.conf [Hans Ulrich Niedermann]
------------------------------------------------------------
merged: hun at n-dimensional.de-20051209214826-c763355e488d6b32
parent: hun at n-dimensional.de-20051206182459-85151abe047f8e59
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
timestamp: Fri 2005-12-09 22:48:26 +0100
message:
ignore BRANCH-INFO file
------------------------------------------------------------
merged: hun at n-dimensional.de-20051206182459-85151abe047f8e59
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
timestamp: Tue 2005-12-06 19:24:59 +0100
message:
Adapted man page generator and templates to bzr 0.6:
* Added links to the docs at http://bazaar.canonical.com/
* Document ~/.bazaar/* instead of ~/.bzr.conf/*
* Document BZR_HOME variable
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131145242-c2495bbc9756d9f3
parent: john at arbash-meinel.com-20060131144844-73cc30d65de20db5
parent: Matthieu.Moy at imag.fr-20060131132251-22fb294ef6a8e1b1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 08:52:42 -0600
message:
[merge] Matthieu Moy & Daniel Silverstone, ftp fixes
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060131132251-22fb294ef6a8e1b1
parent: Matthieu.Moy at imag.fr-20060131114527-863611ab7b8a0b3f
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Tue 2006-01-31 14:22:51 +0100
message:
Credit myself in NEWS. Mentionned FTP connections reuse.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060131114527-863611ab7b8a0b3f
parent: Matthieu.Moy at imag.fr-20060131092814-3b09f3122a0e0308
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Tue 2006-01-31 12:45:27 +0100
message:
Updated the NEWS file
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060131092814-3b09f3122a0e0308
parent: Matthieu.Moy at imag.fr-20060131090300-3844a0f05fc99736
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Tue 2006-01-31 10:28:14 +0100
message:
Raise NoSuchFile in stat when this is the case
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060131090300-3844a0f05fc99736
parent: Matthieu.Moy at imag.fr-20060130190238-e55cacdc28eab6bd
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Tue 2006-01-31 10:03:00 +0100
message:
better error messages on ftp failures
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130190238-e55cacdc28eab6bd
parent: Matthieu.Moy at imag.fr-20060130190156-4a4fd09d31569532
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 20:02:38 +0100
message:
Sleep between retries when the connection closes
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130190156-4a4fd09d31569532
parent: Matthieu.Moy at imag.fr-20060130171033-8eb598010e4850c6
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 20:01:56 +0100
message:
Make ftp put atomic
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130171033-8eb598010e4850c6
parent: Matthieu.Moy at imag.fr-20060130164531-7f10ecf57240aa99
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 18:10:33 +0100
message:
made __number_of_retries global
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130164531-7f10ecf57240aa99
parent: Matthieu.Moy at imag.fr-20060130163816-887c6d44b41ce3be
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 17:45:31 +0100
message:
merge from bzr.dev
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130163816-887c6d44b41ce3be
parent: Matthieu.Moy at imag.fr-20060130064458-ec73d1f3c287df01
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 17:38:16 +0100
message:
One 1 -> _number_of_retries was missing
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130064458-ec73d1f3c287df01
parent: Matthieu.Moy at imag.fr-20060128203303-38a32c095f31c7ad
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 07:44:58 +0100
message:
suggestions by jam and robertc
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060128203303-38a32c095f31c7ad
parent: dsilvers at digital-scurf.org-20060112121704-cc3026dbfc1dc6a6
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Sat 2006-01-28 21:33:03 +0100
message:
try to solve the problem of ftp servers closing the connection
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20060112121704-cc3026dbfc1dc6a6
parent: dsilvers at digital-scurf.org-20060110163059-0f4ec1fab71127ba
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Thu 2006-01-12 12:17:04 +0000
message:
Merge from Martin
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20060110163059-0f4ec1fab71127ba
parent: dsilvers at digital-scurf.org-20060109105147-17dd71ee850f7a60
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Tue 2006-01-10 16:30:59 +0000
message:
Add a NEWS item about bzr missing
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20060109105147-17dd71ee850f7a60
parent: dsilvers at digital-scurf.org-20051212125410-d41faeac886c1187
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Mon 2006-01-09 10:51:47 +0000
message:
Merge from martin
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051212125410-d41faeac886c1187
parent: dsilvers at digital-scurf.org-20051206142634-86cd90cf8ae4fa08
parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Mon 2005-12-12 12:54:10 +0000
message:
Merge Martin
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051206142634-86cd90cf8ae4fa08
parent: dsilvers at digital-scurf.org-20051130150710-61c3a2757ed2d37f
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Tue 2005-12-06 14:26:34 +0000
message:
Merge from martin
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051130150710-61c3a2757ed2d37f
parent: dsilvers at digital-scurf.org-20051130150049-9c05b534db8aaed4
parent: abentley at panoramicfeedback.com-20051129211134-2e69b6ad9ef11c85
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 15:07:10 +0000
message:
Merge in aaron's new missing builtin, fix conflict over it in builtins.py
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051130150049-9c05b534db8aaed4
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
parent: dsilvers at digital-scurf.org-20051117174135-9976b3539124644a
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 15:00:49 +0000
message:
Merge in ftp.py fixes
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051117174135-9976b3539124644a
parent: dsilvers at digital-scurf.org-20051117174009-85f9b63b34e48bd1
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 17:41:35 +0000
message:
Make sure put raises NoSuchFile on appropriate errors. Also ensure we only ever connect once. Seriously. Really.
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051117174009-85f9b63b34e48bd1
parent: dsilvers at digital-scurf.org-20051116162412-3830d783879122c7
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 17:40:09 +0000
message:
Merge from Martin
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131144844-73cc30d65de20db5
parent: john at arbash-meinel.com-20060131142738-5216651eedf189e1
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 08:48:44 -0600
message:
[merge] bzr.dev which merged jam-pending
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131142738-5216651eedf189e1
parent: john at arbash-meinel.com-20060131142422-000d1398c39fd730
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 08:27:38 -0600
message:
[patch] Dennis Duchier: bzr ancestry post-repository bugfix and test case.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131142422-000d1398c39fd730
parent: john at arbash-meinel.com-20060130011327-f98356c226f92f56
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 08:24:22 -0600
message:
[patch] Aaron Bentley: blackbox test and fix for 'bzr find-merge-base'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060130011327-f98356c226f92f56
parent: john at arbash-meinel.com-20060129155904-4f794e2243f81096
parent: john at arbash-meinel.com-20060130010259-39020721b61b67b1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2006-01-29 19:13:27 -0600
message:
[merge] fix-weave-join
More information about the bazaar-commits
mailing list