[openib-general] Re: Testing of 1.0 release candidates

[Tziporet Koren]

Bryan O'Sullivan wrote:
>> This brings me to the following suggestion: I think we should update the 
>> branch with code from the trunk.
>>     
>
> I agree, sort of.  I don't want to do a wholesale pull of code from the
> trunk into the branch.  I have no problem with specific files or even
> entire subsystems being nominated, though.
>
> So in your case, I should bring all the mthca driver and userspace
> changes into the 1.0 branch, probably along with Roland's libibverbs 1.0
> stuff too.  Does that sound right to you?
>   
This will help but it should include also the the core and not mthca and 
libibverbs only. So not clear where we end if we start it.
> Unfortunately, Subversion is such a piece of complete crap for handling
> merges that I think I'll end up using diff and patch to move changes
> back and forth so I can tell what's happening.  It's either that or stop
> using Subversion for real work at all and just dump periodic snapshots
> in there from something sane.  Grumble, grumble.
>
> 	<b
>
>   

I think maybe the branch was opened too early and we need to take 
another branch these days.