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

["Walter Harley" <wharley@xxxxxxx>]

"Sam Mesh" <SamMesh@xxxxxxxxx> wrote in message 
news:440FD8D4.4030803@xxxxxxxxxxxx
> 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



Thanks!

But that document only talks about the first merge from a branch back to the 
head.  What I'm wondering about is the case where (to use the example of the 
document) after that first merge, Paul and Wing continue working on their 
respective files, and then subsequently want to do another merge from the 
p1test branch back into the head.

Suppose that after the first merge is done, both Paul and Wing modify 
f4conflict.txt, Paul modifies f1.txt, Wing modifies f2.txt, and nobody 
touches f3trivial.txt.  What information should I give to the Eclipse 
dialogs, so that the only files that show up in the merge are f1.txt and 
f4conflict.txt (that is, the ones that changed on the branch)?

It seems like whatever I do, I see every file that has changed on either 
branch since the original branch point, rather than seeing only the files 
that have changed on p1test branch since the last merge.

  -walter