Robert Collins
robertc at robertcollins.net
Sun Nov 27 16:39:07 CST 2005
------------------------------------------------------------
revno: 1413
revision-id: robertc at robertcollins.net-20051127223834-d00ecca0d0b9384a
parent: robertc at robertcollins.net-20051122212830-885c284847f0b17b
parent: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2005-11-28 09:38:34 +1100
message:
Merge from mpool, adjusting check to retain HTTP support.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
parent: mbp at sourcefrog.net-20051122041344-d98af0e4bc18f3da
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-22 15:30:14 +1100
message:
Exclude more files from dumb-rsync upload
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122041344-d98af0e4bc18f3da
parent: mbp at sourcefrog.net-20051122033237-5099d6acc4751400
parent: shamrin at gmail.com-20051121092252-4f536da7bb6fee90
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-22 15:13:44 +1100
message:
[merge] win32 fixes (alexey)
------------------------------------------------------------
merged: shamrin at gmail.com-20051121092252-4f536da7bb6fee90
parent: shamrin at gmail.com-20051121090718-48400620bf12c6c6
committer: Alexey Shamrin <shamrin at gmail.com>
branch nick: win32.forgotten
timestamp: Mon 2005-11-21 04:22:52 -0500
message:
updated NEWS to include forgotten changes
------------------------------------------------------------
merged: shamrin at gmail.com-20051121090718-48400620bf12c6c6
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
parent: john at arbash-meinel.com-20051028202916-b350435b905ab6c1
committer: Alexey Shamrin <shamrin at gmail.com>
branch nick: win32.forgotten
timestamp: Mon 2005-11-21 04:07:18 -0500
message:
merge forgotten win32 fixes from http://bzr.arbash-meinel.com/branches/bzr/win32/
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028202916-b350435b905ab6c1
parent: john at arbash-meinel.com-20051028202807-09e118d024cc7856
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 14:29:16 -0600
message:
[patch] Alexander Belchenko patch #12: use os.pathsep for BZR_PLUGIN_PATH
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028202807-09e118d024cc7856
parent: john at arbash-meinel.com-20051028201738-ed1b168cd4aac775
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 14:28:07 -0600
message:
[patch] Alexander Belchenko patch #9, skip stat tests for win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028201738-ed1b168cd4aac775
parent: john at arbash-meinel.com-20051028201605-3479df5255f74bf1
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 14:17:38 -0600
message:
[patch] testhashcache delay for win32 and cygwin
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028201605-3479df5255f74bf1
parent: john at arbash-meinel.com-20051028193852-a9f11a3ecb984a83
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 14:16:05 -0600
message:
Updated build_tree to use fixed line-endings for tests which read the file contents and compare
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028193852-a9f11a3ecb984a83
parent: john at arbash-meinel.com-20051028193246-94db6bf24d9b95b2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:38:52 -0600
message:
Applying fix for EWOULDBLOCK under win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028193246-94db6bf24d9b95b2
parent: john at arbash-meinel.com-20051028193206-a197c629d0c5657a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:32:46 -0600
message:
Updating testconfig to handle missing environment variables
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028193206-a197c629d0c5657a
parent: john at arbash-meinel.com-20051028192629-e441c87ce4bc3b19
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:32:06 -0600
message:
Making old_env a private member
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028192629-e441c87ce4bc3b19
parent: john at arbash-meinel.com-20051028191653-60f76d76b2cac7c2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:26:29 -0600
message:
Refactored environment cleaning code
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028191653-60f76d76b2cac7c2
parent: john at arbash-meinel.com-20051028191501-8f599abdc5062bd2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:16:53 -0600
message:
[patch] Aaron Bentley's HOME fix.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051028191501-8f599abdc5062bd2
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-28 13:15:01 -0600
message:
Adding my win32 patch for moving the home directory.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122033237-5099d6acc4751400
parent: mbp at sourcefrog.net-20051121085156-4fc6a9921c2cc723
parent: aaron.bentley at utoronto.ca-20051119225637-e7afc16a06a31b59
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-22 14:32:37 +1100
message:
[merge] make sure to get all text revisions during merge (aaron)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051119225637-e7afc16a06a31b59
parent: aaron.bentley at utoronto.ca-20051119200756-339f5a64abed668d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2005-11-19 17:56:37 -0500
message:
Fixed fetch to be safer wrt ghosts and corrupt branches
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051119200756-339f5a64abed668d
parent: abentley at panoramicfeedback.com-20051118144716-c27df491076e98f3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2005-11-19 15:07:56 -0500
message:
Added repr for Weave
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051118144716-c27df491076e98f3
parent: abentley at panoramicfeedback.com-20051117204623-4265b87790561ee4
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Fri 2005-11-18 09:47:16 -0500
message:
Merge from Martin
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117204623-4265b87790561ee4
parent: abentley at panoramicfeedback.com-20051117204200-efd6b944e3f7a6be
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 15:46:23 -0500
message:
Removed unused var
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117204200-efd6b944e3f7a6be
parent: abentley at panoramicfeedback.com-20051117155155-bdf57cc1c7efb11d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 15:42:00 -0500
message:
Removed debugging code
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117155155-bdf57cc1c7efb11d
parent: abentley at panoramicfeedback.com-20051117154631-2d0eb45521b98363
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 10:51:55 -0500
message:
Removed debug prints
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117154631-2d0eb45521b98363
parent: abentley at panoramicfeedback.com-20051117154041-912d8f3bdd7d5a62
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 10:46:31 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117154041-912d8f3bdd7d5a62
parent: abentley at panoramicfeedback.com-20051117150928-f40f1a19c81473fb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 10:40:41 -0500
message:
Detect AWOL inventory revisions all at once
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051117150928-f40f1a19c81473fb
parent: aaron.bentley at utoronto.ca-20051116050009-f9639470edb47a84
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Thu 2005-11-17 10:09:28 -0500
message:
Made bzr check for stored revisions missing from ancestry
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051121085156-4fc6a9921c2cc723
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Mon 2005-11-21 19:51:56 +1100
message:
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
(Johan Rydberg)
More information about the bazaar-commits
mailing list