Robert Collins
robertc at robertcollins.net
Wed Oct 26 02:44:53 CDT 2005
------------------------------------------------------------
revno: 1412
revision-id: robertc at robertcollins.net-20051026074446-8829b62a548506c4
parent: robertc at robertcollins.net-20051026073853-d00aa9238737f5b2
parent: robertc at robertcollins.net-20051024140519-8c20eb83b8981c05
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-26 03:44:46 -0400
message:
merge from integration
added:
bzrlib/win32console.py win32console.py-20051021033308-123c6c929d04973d
renamed:
bzrlib/selftest/plugins.py => bzrlib/selftest/testplugins.py plugins.py-20050622075746-32002b55e5e943e9
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_core.py merge_core.py-20050513021216-eda88728698d4401
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/selftest/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/selftest/blackbox.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/selftest/teststatus.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/selftest/versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/weave.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024140519-8c20eb83b8981c05
parent: robertc at robertcollins.net-20051024135918-024629d7ee347b5c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-25 00:05:19 +1000
message:
NEWS file entry for prior commit - upgrades of trees with no revisions should not fail.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024135918-024629d7ee347b5c
parent: robertc at robertcollins.net-20051024085433-5e48ed93d1546627
parent: dilinger at athenacr.com-20051020194856-86687868337effed
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 23:59:18 +1000
message:
fix upgrading of trees with no commits
------------------------------------------------------------
merged: dilinger at athenacr.com-20051020194856-86687868337effed
parent: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
committer: Andres Salomon <dilinger at athenacr.com>
timestamp: Thu 2005-10-20 15:48:56 -0400
message:
Handle the case where revision_history() returns an empty list during
an upgrade. Not a huge problem, since there's really nothing to convert,
but it's nice to not spew errors anyways.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
parent: mbp at sourcefrog.net-20051020034046-c15388d921246708
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 13:55:33 +1000
message:
- notes on testability of plugins
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020034046-c15388d921246708
parent: mbp at sourcefrog.net-20051020021707-8a59b483bb86fe9c
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 13:40:46 +1000
message:
- give a quieter warning if a plugin can't be loaded
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020021707-8a59b483bb86fe9c
parent: mbp at sourcefrog.net-20051019070401-0536bd80d1282c7f
parent: robertc at robertcollins.net-20051020010507-5b7356be0f80930e
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 12:17:07 +1000
message:
[merge] robert
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024085433-5e48ed93d1546627
parent: robertc at robertcollins.net-20051024085306-a3173edd40c87abd
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 18:54:33 +1000
message:
touch up plugin.py docstring
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024085306-a3173edd40c87abd
parent: robertc at robertcollins.net-20051024083732-7f99eeec70f2bbb8
parent: mbp at sourcefrog.net-20051024023528-817a47f36cb21963
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 18:53:06 +1000
message:
merge from martin
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024023528-817a47f36cb21963
parent: mbp at sourcefrog.net-20051024022002-91c6683873cdbb87
parent: robertc at robertcollins.net-20051023151126-c18d3642d09a27ba
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 12:35:28 +1000
message:
[merge] robertc
------------------------------------------------------------
merged: robertc at robertcollins.net-20051023151126-c18d3642d09a27ba
parent: robertc at robertcollins.net-20051023140720-aaa80c33984831a3
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 01:11:26 +1000
message:
'revision.revision_graph can handle having only partial history.
Previously, it would fail for a graph with no revision with no parents.
(Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20051023140720-aaa80c33984831a3
parent: robertc at robertcollins.net-20051023135059-99090b3a95ade1eb
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 00:07:20 +1000
message:
Allow the first revision on revision-history to have parents.
'bzr check' allows the first revision on revision-history to have
parents - something that is expected for cheap checkouts, and occurs
when conversions from baz do not have all history.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051023135059-99090b3a95ade1eb
parent: robertc at robertcollins.net-20051023114619-cec8ca25207b1344
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-23 23:50:59 +1000
message:
BUGFIX: fetch was not skipping all missing parents for inventory insertion
------------------------------------------------------------
merged: robertc at robertcollins.net-20051023114619-cec8ca25207b1344
parent: robertc at robertcollins.net-20051022132747-706eed356bb1a11e
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-23 21:46:19 +1000
message:
More quoting at the transport layer bugfixes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051022132747-706eed356bb1a11e
parent: robertc at robertcollins.net-20051021034358-055268a69a324169
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-10-22 23:27:47 +1000
message:
convert versioning tests to use self.run_bzr, making the test suite quieter
------------------------------------------------------------
merged: robertc at robertcollins.net-20051021034358-055268a69a324169
parent: robertc at robertcollins.net-20051020092046-f41cd3e0c9896b98
parent: robertc at robertcollins.net-20051020074848-6dde0abbc59a1238
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-10-21 13:43:58 +1000
message:
merge setting of name during branching
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020074848-6dde0abbc59a1238
parent: robertc at robertcollins.net-20051020055809-70047c9f64e0a0a0
parent: robertc at robertcollins.net-20051020040918-4498d0a87aa37c87
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 17:48:48 +1000
message:
merge from upstream
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020055809-70047c9f64e0a0a0
parent: robertc at robertcollins.net-20051018120755-dff7965f9c6f9ee8
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 15:58:09 +1000
message:
'bzr branch' sets the branch-name,
It will now set the branch-name to the last component of the
output directory, if one was supplied.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020092046-f41cd3e0c9896b98
parent: robertc at robertcollins.net-20051020040918-4498d0a87aa37c87
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 19:20:46 +1000
message:
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
'merge_flex' no longer calls conflict_handler.finalize(), instead that
is called by merge_inner. This is so that the conflict count can be
retrieved (and potentially manipulated) before returning to the caller
of merge_inner. Likewise 'merge' now returns the conflict count to the
caller. (Robert Collins)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024022002-91c6683873cdbb87
parent: mbp at sourcefrog.net-20051021053602-d0b789804a0dbdd7
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 12:20:02 +1000
message:
Fix http server tests for win32/macos (John)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051021053602-d0b789804a0dbdd7
parent: mbp at sourcefrog.net-20051021051225-4d9cebc5dde11096
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-21 15:36:02 +1000
message:
Make commit message long enough in test for pending merges
so that we see the elipsis characters.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051021051225-4d9cebc5dde11096
parent: mbp at sourcefrog.net-20051021033318-5a5e313f24684453
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-21 15:12:25 +1000
message:
- fix line endings in sftp transport
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051021033318-5a5e313f24684453
parent: mbp at sourcefrog.net-20051020053220-98d5bce475edc359
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-21 13:33:18 +1000
message:
- win32 get_console_size from Alexander
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020053220-98d5bce475edc359
parent: mbp at sourcefrog.net-20051020040116-3896b2868de9e05e
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 15:32:20 +1000
message:
- rules for using destructors
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020040116-3896b2868de9e05e
parent: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 14:01:16 +1000
message:
- fix indents
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024083732-7f99eeec70f2bbb8
parent: robertc at robertcollins.net-20051023151126-c18d3642d09a27ba
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 18:37:32 +1000
message:
BUGFIX: re-sign should accept ranges
More information about the bazaar-commits
mailing list