[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Newbie problems...

From: Todd Denniston
Subject: Re: Newbie problems...
Date: Wed, 05 Sep 2001 09:47:38 -0500

address@hidden wrote:
> What I want to do is bring in a vendor distribution,
>     make changes
>     bring in a new vendor distribution,
>     apply the previous changes to it,
>     make additional changes...
> I can get to about the 2nd or 3rd step above, but at that point I can no
> longer see the 'correct' version 1 or version 2 of the code.
> My reading of the FAQ (p4-5) would imply that I should apply a pair of
> 'tags' at this point (for later use?) namely
>                 cvs rtag bp_v1 truncate
>                 cvs rtag -b -r bp_v1 latest_v1 truncate
> OK, that is v1 + changes, as I did above.
> I try
>                 cd ..
>                 cvs release -d truncate
>                 cvs checkout -r latest_v1 truncate
>           -or-  cvs checkout -r p_v1
> This is back to the ORIGINAL v1, as before.
> At least its the same, but its not what I was expecting.
> I now try
>                 cvs release -d truncate
>                 cvs checkout -r latest_v2 truncate
> And I see v1 + changes, and not v2 as expected.
> can someone point me in the right direction.
> I am either doing something wrong, or I mis-understand what is going
> on.  In either case things are not working the way I expect.
>                                         Reg.Clemens
>                                         address@hidden

I have recently done a vendor branch with multiple updates so what you did
looks reasonably correct.

However one thing I see you doing which may be causing some confusion is using
"cvs rtag -b" which makes a branch ( I think ... as I have avoided branches up
to now), checking out the branch tags might get you somewhat strange results
for this.

I would suggest keep it simple for your test so you are not looking at two
problems at once, i.e. changes in a branch and changes in a vendor branch.

try applying tags with "cvs tag" instead and working only on the trunk and
importing to the vendor branch until you are comfortable with vendor imports. 
This is the method I used with our setup and had no problems ...  after the
second import that is :)

Todd Denniston, Code 6067, NSWC Crane mailto:address@hidden
I'd crawl over an acre of 'Visual This++' and 'Integrated Development
That' to get to gcc, Emacs, and gdb.  Thank you.
        -- Vance Petree, Virginia Power

reply via email to

[Prev in Thread] Current Thread [Next in Thread]