Re: problem with importing vendor sources

[Derek R. Price]

ben bodley wrote:

> On Thu, 26 Oct 2000 05:19:05 Derek R. Price wrote:
>
> thanks a hell of a lot.. things got a bit stressful..

You're welcome.


> 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)

If I understand you correctly you tried to start a local repository by
importing a dir structure probably checked out from somebody else's repository
or based on a snapshot tar file and later tried to update it.

The mistake was using you altered version for the initial import.  The
following process should work assuming you still have an uncorrupted version
of pre5 with your changes:

1) Find a "clean" version of the structure you started working from (i.e. an
unaltered copy).  In the situation you describe I believe that means
linux-2.4.0-pre5.
2) Import it as a new project in your repository:
    cd linux-2.4.0-pre5
    cvs import linux kernel_org linux_2-4-0-pre5
3) Check it out again:
    cd ..
    cvs co linux
4) Do a dumb copy of all the files in you altered archive into the checked out
version.  Equivalently, copy the CVS data directories into your altered
version, but back it up first if you do it this way:
    cp -Rpdx linux-2.4.0-pre5-mine linux-2.4.0-pre5-mine-temp
    cd linux
    find . -type d -name CVS -exec mv {} ../linux-2.4.0-pre5-mine-temp/{} \;
    cd ../linux-2.4.0-pre5-mine-temp
5) Check it in
    cvs ci

Now the repository looks like you've had Linus' version on your vendor branch
the whole time and you can continue importing new releases as you wish and
maintain your version on the trunk.

Again. no warranties express or implied.  Try and understand the commands
above before entering them blindly as they came off the top of my head and may
contain typos and minor errors.

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
I will not burp in class.
I will not burp in class.
I will not burp in class...

          - Bart Simpson on chalkboard, _The Simpsons_