[patch] pending bzr.robey patches

[Robey Pointer]

On 4 Feb 2006, at 15:42, John A Meinel wrote:

> Robert Collins wrote:
>> On Wed, 2006-02-01 at 18:54 -0800, Robey Pointer wrote:
>>> This is where I make a nuisance of myself and send another reminder
>>> of outstanding patches on bzr.robey that are withering and
>>> bitrotting, waiting for a second +1 or integration. :)
>>
>> +1 to the lot.
>>
>>
>> Rob
>
> Merged into jam-integration. I had to do a little bit of conflict
> cleanup, since bzrlib/tests/test_status.py was moved into blackbox,  
> and
> Robey created a new test_status. I fixed that up a little bit, but
> otherwise I merged all of Robey's changes. (jam-integration revno  
> 1526)

Doh.  I could've saved you some trouble if I'd remembered to "push"  
after my last merge.  Hopefully our merges didn't end up too  
differently.

[later:] Looks like there are 2 conflicts, but the only weird one is  
where it looks like "runbzr()" was replaced with "run_bzr()[0]".  Is  
runbzr going away?  (If so, I'll fix up my copy to match yours.)

robey