Rev 1253: Merge from integration. in
/home/robertc/source/baz/storage
Robert Collins
robertc at robertcollins.net
Wed Jan 4 23:35:14 GMT 2006
------------------------------------------------------------
revno: 1253
revision-id: robertc at robertcollins.net-20060104233504-e812d974dcf90849
parent: robertc at robertcollins.net-20060103061804-df9a331ca2af48a4
parent: robertc at robertcollins.net-20060104233225-7ce047eb1fca63ec
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Thu 2006-01-05 10:35:04 +1100
message:
Merge from integration.
added:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
renamed:
bzrlib/tests/test_revision_info.py => bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
------------------------------------------------------------
merged: robertc at robertcollins.net-20060104233225-7ce047eb1fca63ec
parent: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
parent: john at arbash-meinel.com-20060103154418-e6b640e95a1d0e03
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-01-05 10:32:25 +1100
message:
Merge from jam-integration.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103154418-e6b640e95a1d0e03
parent: john at arbash-meinel.com-20060103154333-d2620f4ef0458ac5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-03 09:44:18 -0600
message:
Changed exception traceback route to not use hasattr, which generates its own exception.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103154333-d2620f4ef0458ac5
parent: john at arbash-meinel.com-20060103153337-115c924bb00ae6b3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-03 09:43:33 -0600
message:
Fixed exception handling for fancy_rename
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103153337-115c924bb00ae6b3
parent: john at arbash-meinel.com-20060103152652-5a066586feb99370
parent: john at arbash-meinel.com-20060103151011-2ad890a2ff1475a4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-03 09:33:37 -0600
message:
[merge] bzr-jam-pending 1498
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103151011-2ad890a2ff1475a4
parent: john at arbash-meinel.com-20051230220342-1b6b476e301bb9b4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-01-03 09:10:11 -0600
message:
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230220342-1b6b476e301bb9b4
parent: john at arbash-meinel.com-20051230220140-49a50fa3e9215751
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 16:03:42 -0600
message:
Whitespace cleanup.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230220140-49a50fa3e9215751
parent: john at arbash-meinel.com-20051230205447-e72814c9e3f22832
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 16:01:40 -0600
message:
Updated test_set_user_setting_sets_and_saves to remove the print statement, and make sure it is doing the right thing
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230205447-e72814c9e3f22832
parent: john at arbash-meinel.com-20051230204950-1d268051a677a105
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 14:54:47 -0600
message:
Updated -r revid:foo so that it can match revisions which aren't in the revision history
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230204950-1d268051a677a105
parent: john at arbash-meinel.com-20051230204348-692603ab9626b8d1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 14:49:50 -0600
message:
Forgot a comma
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230204348-692603ab9626b8d1
parent: john at arbash-meinel.com-20051229023607-95f3ed4a0404cfa5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 14:43:48 -0600
message:
Sorted the blackbox tests into alphabetical order.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051229023607-95f3ed4a0404cfa5
parent: john at arbash-meinel.com-20051228194754-27fd0b38f0b9a7f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2005-12-28 20:36:07 -0600
message:
test_revision_info.py is actually a blackbox test.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051228194754-27fd0b38f0b9a7f2
parent: john at arbash-meinel.com-20051222233243-1ff7ae626c03d3d3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2005-12-28 13:47:54 -0600
message:
bzr --version prints branch nickname.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103152652-5a066586feb99370
parent: john at arbash-meinel.com-20060102212036-5013c8712ee1e1ba
parent: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-01-03 09:26:52 -0600
message:
[merge] robert & aaron's integration
------------------------------------------------------------
merged: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
parent: robertc at robertcollins.net-20060102225445-8554f5b0109dbc41
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-03 16:21:37 +1100
message:
Add BRANCH.TODO, and update Makefile to clean pyo files.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060102212036-5013c8712ee1e1ba
parent: john at arbash-meinel.com-20051222233243-1ff7ae626c03d3d3
parent: jaq at spacepants.org-20051230032520-d205be03bad624bd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-01-02 15:20:36 -0600
message:
[merge] Jamie Wilkinson, don't export .bzrignore
------------------------------------------------------------
merged: jaq at spacepants.org-20051230032520-d205be03bad624bd
parent: jaq at spacepants.org-20051229033359-0f03c77b1f99af3b
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Fri 2005-12-30 14:25:20 +1100
message:
add test for directory export
------------------------------------------------------------
merged: jaq at spacepants.org-20051229033359-0f03c77b1f99af3b
parent: jaq at spacepants.org-20051229032631-adc1a9413791860f
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Thu 2005-12-29 14:33:59 +1100
message:
rearrange blackbox tests to be in alphabetical order
------------------------------------------------------------
merged: jaq at spacepants.org-20051229032631-adc1a9413791860f
parent: jaq at spacepants.org-20051229025233-c702c32a14b5001c
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Thu 2005-12-29 14:26:31 +1100
message:
convert tabs to 4-spaces
------------------------------------------------------------
merged: jaq at spacepants.org-20051229025233-c702c32a14b5001c
parent: jaq at spacepants.org-20051229024306-e9ab99850c605c5f
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Thu 2005-12-29 13:52:33 +1100
message:
exclude .bzrignore from exports
------------------------------------------------------------
merged: jaq at spacepants.org-20051229024306-e9ab99850c605c5f
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Thu 2005-12-29 13:43:06 +1100
message:
add blackbox tests for ensuring .bzrignore is not exported
More information about the bazaar-commits
mailing list