Home | Contact Us | FAQ | Search & Site Map | Link to Us
Sign In | Join | Other 45 Sites in Network
HomeAnnouncementsWhite Papers
Discussion GroupsFirst AidDatabasesJavaBeansGUIJava 3DVirtual MachineCORBASecurityToolsGeneral
Java DirectoryOpen Source ProjectsSample Book ChaptersUser GroupsWeb Resources
Related Topics
Databases.NETMore Topics ...

Java Forum / General / April 2006

Tip: Looking for answers? Try searching our database.

CVS Branching with Eclipse

Thread view: 
fsa3@optonline.net - 22 Apr 2006 16:59 GMT
Hi all,

I'm building a web application with Eclipse and want to utilize the CVS
branching to support coding new larger scale functionality while also
being able to make and deploy minor changes.  My experience with CVS is
limited but from my reading it seems like branching and merging is what
I want.

What I've done so far is Tagged the code and then branched it (new
branch is V1_1).  I've been playing around and can't seem to figure out
what the proper way to make changes is and then merge them.

If someone could give some tips on how I should:

a) Make a change to the "base" code and deploy it.
b) Code changes for new functionality and then merge them with minor
changes?

Thanks,
Frank
David Wahler - 22 Apr 2006 21:41 GMT
> I'm building a web application with Eclipse and want to utilize the CVS
> branching to support coding new larger scale functionality while also
[quoted text clipped - 11 lines]
> b) Code changes for new functionality and then merge them with minor
> changes?

First, you need to make sure you're working on the correct branch
before you make changes. You can switch between branches by
right-clicking on the project in the left-hand panel and selecting
Replace With > Another Branch or Version. This will show any branches
you've created, plus the main HEAD branch. The project's icon should
show the name of the current branch, if one other than HEAD has been
selected.

Once you have the branch checked out, you can synchronize with it as
usual to check your modifications in and out. You can also switch
between branches as often as you'd like, but make sure all your changes
are committed first or they'll be overwritten.

When you're ready to merge changes from one branch to another, first
switch to the target branch -- the one you're merging into. Then
right-click on the project, select Team > Merge, and input the name of
the branch and its starting tag. You'll need to resolve any conflicts
by using the Synchronize view.

The Eclipse documentation has a lot of useful information on working
with CVS, by the way; it's in the Workbench User Guide. Hope this
helps!

-- David


Free Magazines

Get these publications absolutely FREE for up to 12 months. There are no hidden fees and no obligation. Simply choose a title, complete the application form and submit it. Read more ...

Oracle MagazineNetwork ComputingComputer WorldBio-IT WorldeWeekInformation WeekInfosecurity
 
Sign In
Join
My Latest Posts
My Monitored Threads
My Blog
My Photo Gallery
My Profile
My Homepage

Start New Thread
Enable EMail Alerts
Rate this Thread



©2008 Advenet LLC   Privacy Policy - Terms of Use
This website includes both content owned or controlled by Advenet as well as content owned or controlled by third parties.