Re: Replacing the head revision

[Alexander von Below]

Hi Jim, all

thanks for the answer so far, hope I am not getting on everybodys 
nerves here...

> First, are you absolutely certain that you do *not* want to merge this 
> file?
> Copying a file from a branch to a trunk is an unusual action.

I am not completely sure, but this is what happened: Not understanding 
branches as well as I should, I created two branches, VER_1-bt and 
VER_2-bt. VER_2-bt is to be stuff for the next release, at some point, 
I would like to merge that, but not now.

I continued to work not in the head (because I misunderstood branches 
and stuff), but in VER_1-bt.
So what I have in VER_1-bt is, de facto, the current, QA'ed, released 
and shipping version. (A copy of it also resides somewhere else on my 
disk.). What's in the head is pretty irrelevant to me at this point 
(The VER_2-bt branch is a different matter, but it does not get touched 
here)

To me, it looks like I want to replace the head version, especially as 
cvs complains about each and every $Revision$ keyword. Of course they 
differ, but can't vim handle that when I do a merge? If not, which 
revision number should I keep in the file? Or throw them out 
altogether?

I would appreciate any further hints you have. I will read the 
documentation on the commands, and I have read the Cederqvist. But 
links to other tutorials would be appreciated.

Thanks

Alex

Am 20.01.2004 um 17:19 schrieb Jim.Hyslop:

> Alexander von Below [mailto:address@hidden wrote:
> > this may be a newbie Q, so I apologize, but my reading of the
> > Cederqvist did not help me...
> >
> > I got a modified copy of my source back.
> >
> > Now I want to replace me head revision with this code.
> >
> > As I had troubles understanding versioning, my current code is in the
> > branch VER_1-bt. I have (manually) updated this branch to the new
> > source.
> First, are you absolutely certain that you do *not* want to merge this 
> file?
> Copying a file from a branch to a trunk is an unusual action.
>
> cvs update -A filename
> cvs update -p -r VER_1-bt filename > filename
>
> should do it.
>
> Make sure you understand what the above commands do before you use 
> them.
>
> --
> Jim Hyslop
> Senior Software Designer
> Leitch Technology International Inc. (<http://www.leitch.com/>)
> Columnist, C/C++ Users Journal (<http://www.cuj.com/experts>)