[news.eclipse.newcomer] Re: merging with CVS

[Sam Mesh <SamMesh@xxxxxxxxx>]

Hi Walter,

Please read a little bit old but, I hope, still valid article:
"Branching with Eclipse and CVS"
http://www.eclipse.org/articles/Article-CVS-branching/eclipse_branch.html

PS. Please CC to me for additional questions (I'm rare newsgroup guest).

--
Sam Mesh

Walter Harley wrote:
> I'm trying to merge from a branch to HEAD of a project in CVS, using 
> Eclipse, and I'm confused about how to do it.
>
> The Team merge dialog asks me for a start and end version tag.  What, 
> exactly, should I be using?  This is a project where some merges have 
> already been done from the branch to the head, so I don't want to repeat 
> those merges, I just want to take the new changes on the branch and 
> integrate them into the head.  I have version tags corresponding to:
>  - the point where the branch was created
>  - the point on the branch that was used as the source for the last merge
>  - the current tip of the branch
>  - the point on the head where the last merge was merged into
>  - the current HEAD
>
> But I'm not sure which, if any, of these to use for which field in the 
> dialog.
>
> It seems like no matter which I use, I end up with the Synchronize view 
> showing me about a zillion differences - much more than the actual set of 
> changes on the branch since the last merge.
>
> Thanks for any help!