I present You here some tips to deal with CVS integration into eclipse.

Tips

  • The tutorial ship with Eclipse is quite good, take a look in HELP or search (cvs) into the help for articles..

Rules:

  • If You have a huge number of Projects in Your workspace, always try to have closed version of these  especially if  you are not supposed to change them.
  • Releases should follows an X.Y.Z convention where:
    • X = The major release number
      An increment of this number generally indicates a significant change to the code base. The increment may be completely incompatible with prior versions.
    • Y = The minor release number
      An increment of this number usually indicates a significant change to functionality or architecture but with a moderate to high level of backward compatibility with previous versions.
    • Z = The maintenance release number
      An increment of this number usually indicates bug fixing within the X.Y release and possibly small enhancements and limited new features. These versions are expected to be fully backwardly compatible with previous increments.

P1X project 1, version X, in workpace
P2Y project 2, version Y
p3Z project 3, version Z
P1H project 1, HEAD version

 Case A: You are continuing the development of a project ...
Your team has reach a milestone, and want to continue development of the project . Happen 98% of the time
IF (you decide to make a change on P1_X) AND (P1_X is the latest closed version of P1) {
Compare project P1_X with the project P1_Head;
IF (P1_X identical to P1_Head) {
Load P1_Head code;
}
ELSE {
IF (P1_Head code is worth loading/using) {
Load P1_Head code;
Compare P1_Head with P1_X, and merge changes if needed to code in workspace;
//You have now a open edition of P1 in workspace which is a merge of P1X and P1H
} ELSE {
jump to case B;
}
}
Continue development;
}


 

 Case B:  

You want to make a patch on a project...

  • The version of the project has already been deployed or sold to customer, and
  • Your actual code may be a lot more advance, but not finished, not tested, possibly breaking interfaces of other components and
  • You prefer to continue development on the old version to reduce risks of instabilities.
//old status of a project which have a problem/your prefer 
Load P1_X in workspace;  (Team - replace with - choose version P1_X) 
On P1_X, create a branch (Team - create branch - name it for ex: P1_X_b01);
Develop, test, develop;
Commit the branch (Team - commit : this put code in its own HEAD)
When the branch is stable, create a version P1_X_1 for example (Team - Tag as verion)

Decide if now if the change done on P1_X_1 are worth to bring in P1_Head, if so You will have to follow Case A







You might like also

InstaSearch bring Apache Lucene search power to Eclipse
Among the 1246 plugins (!) available for #Eclipse, I found this one that I really like to use since it has immediately boost my productivity in Eclipse. InstaSearch is an Eclipse plug-in for doing fast text search in the workspace. The search is performed instantly as-you-type and resulting files are displayed in an #Eclipse view. It is a lightweight plug-in based on Apache Lucene search engine. Each file then can be previewed using few most matching and relevant lines. A …
2976 Days ago
Install PHP support PDT in Eclipse Indigo
Developed by Zend and IBM, Eclipse PDT add support for PHP development and allow to focus on the development of complex PHP-driven web applications. There is currently no package ready to download hence this small how to How to install PDT Download any version of #Eclipse 3.7 Indigo from http://www.eclipse.org/downloads/ and install. Once installed, launch #Eclipse and navigate to Help->Install new Software. Add the Indigo update site http://download.eclipse.org/releases/indigo if you don’t find it in the list. Once the Indigo Update …
3042 Days ago
Eclipse Indigo/New and Noteworthy
Eclipse Indigo is the annual release of #Eclipse projects on June 22 2011; this year 62 project teams are part of the release. New and Noteworthy Eclipse Webtools Project Eclipse Platform Eclipse Mylyn Eclipse Target Management (RSE) JBossTools http://www.jboss.org/tools/download/ Not ready yet for #Eclipse Indigo http://docs.jboss.org/tools/whatsnew/index.html   …
3139 Days ago
Eclipse shared install on a Windows Server 2003/2008
I did develop this solution at work for our internal purpose at www.innoveo.com. Going away from the paradigm “As a developer I run everything locally” isn’t easy to accept but in some rare cases, it make sense. Below I list what I consider to be the main advantages and drawbacks. Stability Not everybody is changing the developer environment as you need admin right to be able to do changes, more stability. The developer environment is standardized: convention over configuration always …
3526 Days ago
Eclipse 3.5 news and noteworthy
It is always difficult to discover what’s new in every Eclipse release, as the number of features is just growing over the years. More difficult is even to locate the new and noteworthy page, that’s why I list them all below for eclipse 3.5 News and noteworthy pages contains interesting or significant changes made to the #Eclipse Platform for the 3.5 release of #Eclipse.     New for #Eclipse 3.5 milestone build M7 (April 30, 2009) New for #Eclipse 3.5 …
3860 Days ago
Eclipse Galileo aka eclipse 3.5 is here
For the sixth year in a row, the #Eclipse community has delivered its annual release train on its scheduled date. Galileo, the 2009 release train, is the largest ever release from the #Eclipse community, comprising 33 projects and over 24 million lines of code. Over 380 committers from 44 different organizations participated to make this release possible.     Download it now Note: Subversive is part of Galileo, but the first time you sync your code, you may get in …
3861 Days ago
Boost Eclipse speed performances part 2
  After the huge success and feedback of my first tips on how to speed eclipse, here are more performances tips, some are obvious some not: Disabled/Exclude the virus scanner for the eclipse directory: while obvious It will or may be difficult to achieve if you're not administrator on your machine (while not impossible) and that may not make some people happy especially security officers ;-) It is obvious that scanning on the fly every resources in a workspace, is …
3957 Days ago
Get a command prompt on any Eclipse project
  A very little trick that allow you to quickly run any operation involving a DOS command on an Eclipse project. Go to the external launcher, and create a new configuration. This trick may be useful for running your Maven set of command without any dependencies to M2Eclipse.     …
3963 Days ago
All Eclipse Ganymede Shortcuts
Here is the list of all 380 default shortcuts keys for eclipse Ganymede in an easy to print layout (4 pages A4). I recommend you to print a booklet out of it. Nobody on Internet is currently providing such a list, except a sourceforge project but their keys binding is for eclipse 2.1,Others keys binding for eclipse will follows soon. 3rd party plugin shortcuts: Oxygen XML editor Subversive SVN Codehaus M2Eclipse #Maven Download as PDF now eclipse.ganymede.shortcuts.keys.binding.pdf …
4138 Days ago
Three Eclipse plug-ins for improving your Java code
A great thing about #Eclipse is that you can easily extend it with additional functionality and there are plenty of add-on to choose from. We would like to highlight three free plug-ins that help our #Java developers improve their code.   Checkstyle improves the readability of #Java code by helping developers adhere to coding conventions. #Eclipse has powerful auto-formatting capabilities but lacks the ability to warn when coding conventions are not followed. Checkstyle provides configurable rule sets and adds warnings …
4167 Days ago