Re: [MERGE] Final cachemgr-refactor mergeset, including hno's peer_userhash and peer_sourcehash

Robert Collins wrote:
> On Tue, 2008-07-15 at 05:27 +1200, Amos Jeffries wrote:
>> Kinkie wrote:
>>>>> Merged code failed testing. Please run "make check" again and fix this.
>>> Fixed code now in launchpad. Please let me know if you want it sent
>>> (see my other mail).
>>>
>> I'm still learning the finer arts of bzr and haven't got to pulling
>> merge patches from trunk vs stand-alone branches yet. I tried it on my
>> audit checkout of your branch, but the history was missing.
>
> 'bzr merge URL' or 'bzr pull URL' should just work. What error did you
> get?

I failed trying it the long way, mirror other branch, then merge from
mirror. works but doesn't keep history log across that merge.

I'll give it a try the proper way.

Amos

-- 
Please use Squid 2.7.STABLE3 or 3.0.STABLE7