RE: Cross merging

[Jim.Hyslop]

Erik Andersson wrote:
> Anyone who tell me about or point me to any good information 
> about cross
> branching? Is cross branching on a regular basis a risk or is it
> straightforward and only to keep track of what's merged where etc.
What do you mean by "cross branching?" I have some guesses, but rather than
guess wrong I'd like you to explain :=)

> One more question:
> When merging from a branch for the first time I remember reading
> something about only using on tag, but I cannot find where I 
> read it. Is
> there a difference in using one or two tags when merging a branch for
> the first time?
You probably saw it in the manual for 'cvs update'. If you specify one -j
option, then CVS will treat it as the second -j option, and use the branch
point as the first, i.e.:

cvs update -j tag-you-specify

is treated as:

cvs update -j branch-point -j tag-you-specify

-- 
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. ( http://www.leitch.com )
Columnist, C/C++ Users Journal ( http://www.cuj.com/experts )