Rev 1682: (mbp) various fixes in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat May 13 00:48:50 BST 2006
------------------------------------------------------------
revno: 1682
revision-id: pqm at pqm.ubuntu.com-20060512234849-259ff209fff58489
parent: pqm at pqm.ubuntu.com-20060511175037-f66b84c6a9fc4c12
parent: mbp at sourcefrog.net-20060512065947-60e259ffea0bf4fb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-05-13 00:48:49 +0100
message:
(mbp) various fixes
removed:
notes/ notes-20050309064844-c41b58b77e2b0876
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/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/win32console.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060512065947-60e259ffea0bf4fb
parent: mbp at sourcefrog.net-20060511081709-2cf6b60a3d5a33fb
parent: pqm at pqm.ubuntu.com-20060511175037-f66b84c6a9fc4c12
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-05-12 16:59:47 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060511081709-2cf6b60a3d5a33fb
parent: mbp at sourcefrog.net-20060510111913-bcbec46d0753610e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-05-11 18:17:09 +1000
message:
use the correct transaction when committing snapshot (Malone: #43959)
Without this, file merges committed in a checkout can't be properly
pushed into the master repository.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060510111913-bcbec46d0753610e
parent: mbp at sourcefrog.net-20060510082630-0ae7b738a32e0e83
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-05-10 21:19:13 +1000
message:
Handle 'bzr commit DIR' when dir contains pending merges.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060510082630-0ae7b738a32e0e83
parent: mbp at sourcefrog.net-20060510075051-4523698f36a36d87
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-05-10 18:26:30 +1000
message:
Add KnitVersionedFile.__repr__ method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060510075051-4523698f36a36d87
parent: mbp at sourcefrog.net-20060510071332-da159fb5509a8886
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-05-10 17:50:51 +1000
message:
Make text_factory test not depend on 80-col terminal
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060510071332-da159fb5509a8886
parent: mbp at sourcefrog.net-20060510035936-1ca2a08c09240b31
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-05-10 17:13:32 +1000
message:
Bump version to 0.9.0
Also generate bzrlib.__version__ from version_info tuple
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060510035936-1ca2a08c09240b31
parent: mbp at sourcefrog.net-20060510034942-d317207825dff3c1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-05-10 13:59:36 +1000
message:
Remove old empty notes directory
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060510034942-d317207825dff3c1
parent: mbp at sourcefrog.net-20060510030040-4a6b809a4b6049cd
parent: olaf at conradi.org-20060509102944-613ac44d132a72fc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-05-10 13:49:42 +1000
message:
(merge olaf) info test improvements
------------------------------------------------------------
merged: olaf at conradi.org-20060509102944-613ac44d132a72fc
parent: olaf at conradi.org-20060508123650-e02d015836357f55
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Tue 2006-05-09 12:29:44 +0200
message:
Fix test case for bzr info in upgrading a standalone branch to metadir,
uses bzrlib API now.
------------------------------------------------------------
merged: olaf at conradi.org-20060508123650-e02d015836357f55
parent: olaf at conradi.org-20060501131509-e7c2f9d82251c34b
parent: pqm at pqm.ubuntu.com-20060508035625-57977d108d877af8
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-08 14:36:50 +0200
message:
Merge with bzr.dev after 0.8 release.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060510030040-4a6b809a4b6049cd
parent: mbp at sourcefrog.net-20060510030032-739cc533cae68844
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-05-10 13:00:40 +1000
message:
Typo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060510030032-739cc533cae68844
parent: mbp at sourcefrog.net-20060509071638-c6cb81c352612d82
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-05-10 13:00:32 +1000
message:
Remove documentation for deleted uncommit --all flag
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060509071638-c6cb81c352612d82
parent: mbp at sourcefrog.net-20060509070948-734ebe91f1c96032
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-05-09 17:16:38 +1000
message:
(win32) Detect terminal width using GetConsoleScreenBufferInfo (Alexander)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060509070948-734ebe91f1c96032
parent: mbp at sourcefrog.net-20060508043950-bb61b1e5ea33c349
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-05-09 17:09:48 +1000
message:
Detect terminal width using ioctl
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060508043950-bb61b1e5ea33c349
parent: pqm at pqm.ubuntu.com-20060508035625-57977d108d877af8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-05-08 14:39:50 +1000
message:
Fix time-dependency in LockDir tests -- allow more margin for error in time to detect lock contention
More information about the bazaar-commits
mailing list