Rev 1411: New version from integration. in
/home/robertc/source/baz/launchpad
Robert Collins
robertc at robertcollins.net
Wed Dec 14 08:53:00 GMT 2005
------------------------------------------------------------
revno: 1411
revision-id: robertc at robertcollins.net-20051214085253-cdd1a4fc6eb05fe6
parent: robertc at robertcollins.net-20051205090428-676d964fe241ed9b
parent: robertc at robertcollins.net-20051214075934-6e951a9908674e50
committer: Robert Collins <robertc at robertcollins.net>
branch nick: launchpad
timestamp: Wed 2005-12-14 19:52:53 +1100
message:
New version from integration.
added:
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_revno.py test_revno.py-20051204214528-2f0bf83a71b7656a
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_remove.py test_remove.py-20051212071329-1925f463b565a5c3
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr_man.py bzrman.py-20050601153041-0ff7f74de456d15e
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/store/weave.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weavefile.py weavefile.py-20050629135233-2ffe0200f103f6c2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: robertc at robertcollins.net-20051214075934-6e951a9908674e50
parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-14 18:59:34 +1100
message:
merge from mbp.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
parent: mbp at sourcefrog.net-20051213054640-05a8971e11b1ba66
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:48:04 +1100
message:
MsgEditor tests should be skipped on platforms without unicode fs.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213054640-05a8971e11b1ba66
parent: mbp at sourcefrog.net-20051213054051-a82f95d7d417f73b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:46:40 +1100
message:
Fix up display of reasons why tests were skipped.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213054051-a82f95d7d417f73b
parent: mbp at sourcefrog.net-20051213051217-5efd4ec3b060bfaf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:40:51 +1100
message:
New TestSkipped facility, and tests for it.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213051217-5efd4ec3b060bfaf
parent: mbp at sourcefrog.net-20051213035433-26282b8f72702fc3
parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:12:17 +1100
message:
[merge] robertc, source-examination test
------------------------------------------------------------
merged: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
parent: robertc at robertcollins.net-20051212220750-e1ff9f5a18f795ad
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2005-12-13 09:34:21 +1100
message:
Bugfix to source testing logic to get the right path when .py is returned by __file__
------------------------------------------------------------
merged: robertc at robertcollins.net-20051212220750-e1ff9f5a18f795ad
parent: robertc at robertcollins.net-20051208055700-5d85edd70fd15d4d
parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2005-12-13 09:07:50 +1100
message:
Merge from mbp.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
parent: mbp at sourcefrog.net-20051212070634-364b095fe76623e5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 18:20:02 +1100
message:
[patch] fix for 'bzr rm -v' (Wouter van Heyst)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051212070634-364b095fe76623e5
parent: mbp at sourcefrog.net-20051212052559-d3b1591f2404e90a
parent: aaron.bentley at utoronto.ca-20051212002414-d5c9e3eab54e705a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 18:06:34 +1100
message:
[merge] improved 'missing' command from aaron
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051212002414-d5c9e3eab54e705a
parent: aaron.bentley at utoronto.ca-20051129050222-56e09f54af4e21d5
parent: aaron.bentley at utoronto.ca-20051212002032-1a2c4bdb573bf3bc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2005-12-11 19:24:14 -0500
message:
Merged the new bzr missing command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051212002032-1a2c4bdb573bf3bc
parent: aaron.bentley at utoronto.ca-20051211232656-8b2d7eaa92903c39
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 19:20:32 -0500
message:
Added unit tests for find_unmerged
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211232656-8b2d7eaa92903c39
parent: aaron.bentley at utoronto.ca-20051211224007-bf524313537779dc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 18:26:56 -0500
message:
Test every option for "bzr missing"
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211224007-bf524313537779dc
parent: aaron.bentley at utoronto.ca-20051211223621-bd7b225c3f212d15
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:40:07 -0500
message:
Fixed up tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211223621-bd7b225c3f212d15
parent: aaron.bentley at utoronto.ca-20051211222951-7adde03c2e93b70c
parent: larstiq at larstiq.dyndns.org-20051211220521-094e867abca7417c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:36:21 -0500
message:
Added tests from LarstiQ
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051211220521-094e867abca7417c
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.lq
timestamp: Sun 2005-12-11 23:05:21 +0100
message:
Add testcase for missing command, improved with feedback from Robert
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
parent: mbp at sourcefrog.net-20051206051943-e7422764401f2d2e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-06 17:53:25 +1100
message:
News entries for recent merge from John.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051206051943-e7422764401f2d2e
parent: mbp at sourcefrog.net-20051206051616-5952d343e0ea9a45
parent: james.henstridge at canonical.com-20051202033643-11c50c1f530b3e13
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-06 16:19:43 +1100
message:
[merge] jamesh, unicode fixes
------------------------------------------------------------
merged: james.henstridge at canonical.com-20051202033643-11c50c1f530b3e13
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.smallfixes
timestamp: Fri 2005-12-02 11:36:43 +0800
message:
Don't encode unicode messages to UTF-8 in mutter() (the stream writer does it).
Use a codec wrapped log file in tests to match the real environment.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051206051616-5952d343e0ea9a45
parent: mbp at sourcefrog.net-20051205120437-b6b3e28a9ea0fae5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-06 16:16:16 +1100
message:
Remove deleted test of basicio from list of tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051205120437-b6b3e28a9ea0fae5
parent: mbp at sourcefrog.net-20051205070710-70afd75c420d1901
parent: john at arbash-meinel.com-20051204215501-9ee53a39579d1e28
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 23:04:37 +1100
message:
[merge] john
------------------------------------------------------------
merged: john at arbash-meinel.com-20051204215501-9ee53a39579d1e28
parent: john at arbash-meinel.com-20051204214539-cce799161beccc33
parent: mbp at sourcefrog.net-20051202054235-ea9c5479f97c3bf6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-04 15:55:01 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051204214539-cce799161beccc33
parent: john at arbash-meinel.com-20051204214109-c8ab203540fba5df
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-04 15:45:39 -0600
message:
Forgot to add the test case
------------------------------------------------------------
merged: john at arbash-meinel.com-20051204214109-c8ab203540fba5df
parent: john at arbash-meinel.com-20051203180221-6b0304c6353a9c9c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-04 15:41:09 -0600
message:
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
Plus a test case.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051203180221-6b0304c6353a9c9c
parent: john at arbash-meinel.com-20051202171817-0ac180714e18a125
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sat 2005-12-03 12:02:21 -0600
message:
Added some extra logging when we get http exceptions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202171817-0ac180714e18a125
parent: john at arbash-meinel.com-20051202171410-3496e296756926f9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-12-02 11:18:17 -0600
message:
Changing final merge message to All changes applied successfully, rather than 0 conflicts applied.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202171410-3496e296756926f9
parent: john at arbash-meinel.com-20051202054031-273baec33b90578c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-12-02 11:14:10 -0600
message:
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202054031-273baec33b90578c
parent: john at arbash-meinel.com-20051201213142-3bf0c6acc9c5355d
parent: john at arbash-meinel.com-20051202053717-d7fd7760c548661e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2005-12-01 23:40:31 -0600
message:
[merge] Fixing port selection bug with sftp.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202053717-d7fd7760c548661e
parent: john at arbash-meinel.com-20051201013132-76797e2be4758e1c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Thu 2005-12-01 23:37:17 -0600
message:
James Henstridge confirmed that sftp.py needs self._port or 22
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201013132-76797e2be4758e1c
parent: john at arbash-meinel.com-20051201004321-67f38d47e3be46ec
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp-fix
timestamp: Wed 2005-11-30 19:31:32 -0600
message:
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201213142-3bf0c6acc9c5355d
parent: john at arbash-meinel.com-20051201211342-209492d29f37ef65
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 15:31:42 -0600
message:
[merge] Refactor NoSuchFile style exceptions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201211342-209492d29f37ef65
parent: john at arbash-meinel.com-20051201164205-77a96ba84f3085f8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 15:13:42 -0600
message:
Don't import ui_factory directly, in case it gets changed later.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201164205-77a96ba84f3085f8
parent: john at arbash-meinel.com-20051201154910-65a7e42375c28cbc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 10:42:05 -0600
message:
[bug 3632] Matthieu Moy- bzr cat should default to last revision
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201154910-65a7e42375c28cbc
parent: john at arbash-meinel.com-20051201152250-e794a08480d6dfa9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 09:49:10 -0600
message:
Cleanup of test_pull.py headers
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201152250-e794a08480d6dfa9
parent: john at arbash-meinel.com-20051201151922-11869ebb4993123f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 09:22:50 -0600
message:
Fix broken test from refactoring blackbox/test_pull
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201151922-11869ebb4993123f
parent: john at arbash-meinel.com-20051201145705-28071de6fbc274af
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 09:19:22 -0600
message:
Fixed a broken test from my 'push updates local working tree' fix
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201145705-28071de6fbc274af
parent: john at arbash-meinel.com-20051201013527-f890aade00ef57b9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-01 08:57:05 -0600
message:
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201013527-f890aade00ef57b9
parent: john at arbash-meinel.com-20051201010206-0b2476ecb6f0f9a8
parent: john at arbash-meinel.com-20051201013132-76797e2be4758e1c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2005-11-30 19:35:27 -0600
message:
[merge] fix bug where push was broken to remote trees
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051205070710-70afd75c420d1901
parent: mbp at sourcefrog.net-20051205032419-25f8b2e13aaabf8b
parent: robertc at robertcollins.net-20051202032347-ba08123207a945a0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 18:07:10 +1100
message:
[merge] robert
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211222951-7adde03c2e93b70c
parent: aaron.bentley at utoronto.ca-20051211220440-287aea608ac8ed8b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:29:51 -0500
message:
All tests pass
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211220440-287aea608ac8ed8b
parent: aaron.bentley at utoronto.ca-20051211220405-6002fa6de0ef8ce0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:04:40 -0500
message:
Noted difference of opinion wrt BzrCommandError
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211220405-6002fa6de0ef8ce0
parent: aaron.bentley at utoronto.ca-20051211215248-7e44e03f11ad2ec5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:04:05 -0500
message:
Set status to 1 when there are missing revisions on either side.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211215248-7e44e03f11ad2ec5
parent: aaron.bentley at utoronto.ca-20051211202841-44e47aeb2895bf49
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 16:52:48 -0500
message:
fixed location handling to match old missing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211202841-44e47aeb2895bf49
parent: aaron.bentley at utoronto.ca-20051211075914-ef46f14b0ab647b8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 15:28:41 -0500
message:
Removed merge fix with no test case
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211075914-ef46f14b0ab647b8
parent: aaron.bentley at utoronto.ca-20051211075126-7785e370b0f70cbc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 02:59:14 -0500
message:
Added missing revision counts.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211075126-7785e370b0f70cbc
parent: abentley at panoramicfeedback.com-20051129211134-2e69b6ad9ef11c85
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 02:51:26 -0500
message:
merged the mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129211134-2e69b6ad9ef11c85
parent: abentley at panoramicfeedback.com-20051129202344-10d31e85468d0de8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 16:11:34 -0500
message:
Added log formatter selection and show-ids to missing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129202344-10d31e85468d0de8
parent: abentley at panoramicfeedback.com-20051129200000-cd4331961ebedd63
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 15:23:44 -0500
message:
Added no-difference message
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129200000-cd4331961ebedd63
parent: abentley at panoramicfeedback.com-20051129195419-9f87fe116aff380d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 15:00:00 -0500
message:
Refactored shortcut
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129195419-9f87fe116aff380d
parent: abentley at panoramicfeedback.com-20051129192044-43b22b9806c73fb3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 14:54:19 -0500
message:
Added revision-history shortcuts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129192044-43b22b9806c73fb3
parent: abentley at panoramicfeedback.com-20051129191719-08a4f85324588aa5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 14:20:44 -0500
message:
Ensured progress bar is cleaned up except for lock errors
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129191719-08a4f85324588aa5
parent: abentley at panoramicfeedback.com-20051129184747-3f28d5b7a02f7955
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 14:17:19 -0500
message:
More refactoring, handled branches with no commits
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129184747-3f28d5b7a02f7955
parent: abentley at panoramicfeedback.com-20051129183500-0da736b0a323dded
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:47:47 -0500
message:
Used more set operations
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129183500-0da736b0a323dded
parent: abentley at panoramicfeedback.com-20051129183421-8ee4609bc4c8fec3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:35:00 -0500
message:
Inverted the meaning of reverse
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129183421-8ee4609bc4c8fec3
parent: abentley at panoramicfeedback.com-20051129181721-b7818abfc198e50a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:34:21 -0500
message:
Restructured find_unmerged, so it returns lists of (revno, revision) pairs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129181721-b7818abfc198e50a
parent: abentley at panoramicfeedback.com-20051129174759-b6fc5d163e28834b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:17:21 -0500
message:
Factored out find_unmerged
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129174759-b6fc5d163e28834b
parent: abentley at panoramicfeedback.com-20051129174721-c2ba7e09668e0b89
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 12:47:59 -0500
message:
Replace missing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129174721-c2ba7e09668e0b89
parent: aaron.bentley at utoronto.ca-20051129050222-56e09f54af4e21d5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 12:47:21 -0500
message:
Import Kinnison's plugin
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051129050222-56e09f54af4e21d5
parent: aaron.bentley at utoronto.ca-20051126013218-9c8e1f00ccba641e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2005-11-29 00:02:22 -0500
message:
Fixed revert bug [NEEDS TEST CASE]
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051212052559-d3b1591f2404e90a
parent: mbp at sourcefrog.net-20051208120109-dbead329ce38f295
parent: michael at ellerman.id.au-20051209071246-cc9d514bb992f011
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 16:25:59 +1100
message:
[merge] add --dry-run option (mpe)
------------------------------------------------------------
merged: michael at ellerman.id.au-20051209071246-cc9d514bb992f011
parent: michael at ellerman.id.au-20051209071231-5b895fd4faca47b8
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: add-dry-run
timestamp: Fri 2005-12-09 01:12:46 -0600
message:
Add tests for bzr add --dry-run
------------------------------------------------------------
merged: michael at ellerman.id.au-20051209071231-5b895fd4faca47b8
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: add-dry-run
timestamp: Fri 2005-12-09 01:12:31 -0600
message:
Add support for bzr add --dry-run
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208120109-dbead329ce38f295
parent: mbp at sourcefrog.net-20051208073529-61ad33e6c4fc8e61
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 23:01:09 +1100
message:
[patch] add a selftest test that the setup build script works (Alexander Belchenko)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208073529-61ad33e6c4fc8e61
parent: mbp at sourcefrog.net-20051208071308-3a71ecddda863fa8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 18:35:29 +1100
message:
[patch] read only the table-of-contents of weaves to speed up commit
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208071308-3a71ecddda863fa8
parent: mbp at sourcefrog.net-20051208071037-1a8ad346ec267c2d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 18:13:08 +1100
message:
[patch] refactor code that make sure stores are opened with unicode filenames (robertc)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208071037-1a8ad346ec267c2d
parent: mbp at sourcefrog.net-20051208061800-1849090041773314
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 18:10:37 +1100
message:
Add additional module for lsprof.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208061800-1849090041773314
parent: mbp at sourcefrog.net-20051208040047-8fdf91aa5b0047f0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 17:18:00 +1100
message:
New --lsprof option from Denys Duchier
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208040047-8fdf91aa5b0047f0
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
parent: robertc at robertcollins.net-20051207061337-6edae828b9c29103
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 15:00:47 +1100
message:
[merge] robertc, small tests
------------------------------------------------------------
merged: robertc at robertcollins.net-20051207061337-6edae828b9c29103
parent: robertc at robertcollins.net-20051207055358-757787e694d89456
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-07 17:13:37 +1100
message:
Test for the number of uses of self.working_tree() in branch.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051207055358-757787e694d89456
parent: robertc at robertcollins.net-20051207030832-1f86f7bf2daeecf2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-07 16:53:58 +1100
message:
Test for the number of uses of self.working_tree() in branch.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051207030832-1f86f7bf2daeecf2
parent: robertc at robertcollins.net-20051206082223-46591e053716a9ce
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-07 14:08:32 +1100
message:
Merge from mbp.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051206082223-46591e053716a9ce
parent: robertc at robertcollins.net-20051206050437-700e48df5e094d7f
parent: mbp at sourcefrog.net-20051206051943-e7422764401f2d2e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2005-12-06 19:22:23 +1100
message:
Merge from mbp AGAIN.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051206050437-700e48df5e094d7f
parent: robertc at robertcollins.net-20051205074009-ab11929b3456c4c9
parent: mbp at sourcefrog.net-20051205120437-b6b3e28a9ea0fae5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2005-12-06 16:04:37 +1100
message:
merge from mbp.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051208055700-5d85edd70fd15d4d
parent: robertc at robertcollins.net-20051207061337-6edae828b9c29103
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2005-12-08 16:57:00 +1100
message:
Test the uses of WorkingTree from branch.py
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213035433-26282b8f72702fc3
parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 14:54:33 +1100
message:
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
More information about the bazaar-commits
mailing list