Re: Overwriting trunk files with specific branch files

[Sergei Organov]

Andy Jones <address@hidden> writes:

> > >cvs co -j HEAD -j t_branchA_tagA module
> 
> Does anyone feel like explainaing how this is not a merge?  I don't
> get it.

As far as I understand, this calculates delta that would bring HEAD to
t_branchA_tagA and applies the delta to the working directory that
happens to match HEAD. So the result is just t_branchA_tagA without any
merge.

-- 
Sergei.