Re: problem with importing vendor sources

[ben bodley]

On Thu, 26 Oct 2000 05:19:05 Derek R. Price wrote:

> 
> The next merge should be something like:
> 
>     cvs up -jv2_4_0_test5 -jv2_4_0_test6
>     cvs ci
> 
> No warranties and all that jazz.
> 
> Derek
> 

derek,

thanks a hell of a lot.. things got a bit stressful..

i managed to back out the changes successfully, and have decided not to
pursue any vendor imports again until i can understand things a bit more
reliably..

i think part of the problem also, is that we imported "our" changes as a
vendor aswell, and this means multiple vendor branches (confusing for me to
say the least)..

what i've decided to do is work on another repository in parallel, and
slowly add our changes manually (ie. NOT as a vendor import) and then
continue importing new kernels on the kernel_org branch (that being the
only vendor we import sources from)

cheers, and thanks a lot :)

ben

-- 
/\\------------------------------------------------------------- -- -
ben.bodley/.m2technologyltd.nz/address@hidden/.64.9.4448307ext130