| merging with CVS [message #142322] |
Thu, 09 March 2006 02:44  |
Eclipse User |
|
|
|
Originally posted by: wharley.bea.com
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!
|
|
|
| Re: merging with CVS [message #142351 is a reply to message #142322] |
Thu, 09 March 2006 07:27  |
| Eclipse User |
|
|
|
Originally posted by: SamMesh.gmail.com
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/eclips e_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!
>
>
|
|
|
| Re: merging with CVS [message #142469 is a reply to message #142351] |
Fri, 10 March 2006 00:37 |
| Eclipse User |
|
|
|
Originally posted by: wharley.bea.com
"Sam Mesh" <SamMesh@gmail.com> wrote in message
news:440FD8D4.4030803@gmail.com...
> 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/eclips e_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
|
|
|
Powered by
FUDForum. Page generated in 0.11531 seconds
] 
Search
Help
Register
Login
Home
