Skip to main content


Eclipse Community Forums

      Home
Home » Newcomers » Newcomers » how do I merge changes between to branches in cvs
how do I merge changes between to branches in cvs [message #158128] Thu, 22 June 2006 12:11 Go to next message
Eclipse UserFriend
I have a project that I have created a release R1 branch in CVS for. I
now wish to merge several changes from R1 back into HEAD.

When I try to use Team -> Merge, setting the end tag to HEAD and the
start tag to Root_R1 I am told there is nothing to merge??? However a
compare definitely shows the file in R1 to be different from HEAD.

any help appreciated
Re: how do I merge changes between to branches in cvs [message #158161 is a reply to message #158128] Thu, 22 June 2006 18:44 Go to previous messageGo to next message
Eclipse UserFriend
Originally posted by: wharley.bea.com

"teknokrat" <teknokrat@yahoo.com> wrote in message
news:e7efft$vde$1@utils.eclipse.org...
>I have a project that I have created a release R1 branch in CVS for. I now
>wish to merge several changes from R1 back into HEAD.
>
> When I try to use Team -> Merge, setting the end tag to HEAD and the start
> tag to Root_R1 I am told there is nothing to merge??? However a compare
> definitely shows the file in R1 to be different from HEAD.


Try doing the merge in a workspace that is synced to HEAD, using Root_R1 as
a start and whatever the current tip of R1 is for end tag. In other words,
merge "from R1" rather than "to HEAD".
Re: how do I merge changes between to branches in cvs [message #158262 is a reply to message #158128] Fri, 23 June 2006 14:28 Go to previous message
Eclipse UserFriend
Originally posted by: eclipse4.rizzoweb.com

teknokrat wrote:
> I have a project that I have created a release R1 branch in CVS for. I
> now wish to merge several changes from R1 back into HEAD.
>
> When I try to use Team -> Merge, setting the end tag to HEAD and the
> start tag to Root_R1 I am told there is nothing to merge??? However a
> compare definitely shows the file in R1 to be different from HEAD.
>
> any help appreciated

Open the Eclipse Help and search for "merging from a branch" - one of
the matching pages describes exactly the process to follow.

Hope this helps,
Eric
Previous Topic:breakpoints not working?
Next Topic:Migrating from JBuilder to Eclipse
Goto Forum:
  


Current Time: Sun Jul 27 18:39:17 EDT 2025

Powered by FUDForum. Page generated in 0.08772 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top

Sign up to our Newsletter

A fresh new issue delivered monthly