Tag: version control

Beginning Eclipse CVS – Branching Tutorial 4: Create a branch

Posted on by

<= Back to previous section “Share the Project”

    NOTE: This section of the Eclipse CVS tutorial is based on Paul Glezen’s article on the Eclipse website: Branching with Eclipse and CVS, and is used with his permission under the terms of the EPL license. The changes I am making to his version are mainly to expand it with more step by step images and explanations, and integrate it with my own beginner tutorials in an attempt to make it more accessible to beginners and designers. Experienced developers will probably prefer to work from Paul’s version.

    Now that you have created a project, the other people on your team should check it out from CVS. If they aren’t sure how to check out a project from CVS, have them view this tutorial then return here.

    Scenario walkthrough

    We’ll be following the workflow shown in the diagram below. This article will employ a scenario of two programmers, Paul and Wing, working on separate branches of the same project. 

    scenario1.jpg

    Continue reading below break…

    Continue reading

Beginning Eclipse CVS – Branching Tutorial 1: Branching Strategies

Posted on by

<= Back to previous section “Setting up the Eclipse Interface for CVS”

NOTE: This section of the Eclipse CVS tutorial is based on Paul Glezen’s article on the Eclipse website: Branching with Eclipse and CVS, and is used with his permission under the terms of the EPL license. The changes I am making to his version are mainly to expand it with more step by step images and explanations, and integrate it with my own beginner tutorials in an attempt to make it more accessible to beginners and designers. Experienced developers will probably prefer to work from Paul’s version.
When working together in a team, developers often need to isolate code lines from each other to prevent conflicts. Besides the possibility of simply stepping on each other’s toes and overwriting new versions with older versions, different functions under development may conflict with each other while being tested.

To prevent this, projects can be developed in concurrent paths, with one path being devoted to the main line of development and others set aside for testing new features or bugfixes. One line can be kept stable or close to stable, with others not yet even in testing. Several common configuration strategies are used for team collaboration on software development.

 
Continue reading below break:

Continue reading

Beginning Eclipse CVS – Basics 1: Getting Started

Posted on by

Eclipse is an open-source software development platform or IDE that has CVS (version control) functions built-in. Although Eclipse was originally built for Java development, it is very useful for working in other languages as well because of it’s open plugin-based architecture. It is often used as the foundation for new applications because it is so easily extended. This series will focus on the basics of using Eclipse for for version control, for web designers or beginning developers.

Continue reading below break…

Continue reading

CVS error: server reported an error while performing the “cvs add” command. common: cvs server: [filename] added independently by second party.

Posted on by

When trying to replace some old files in my local workspace, then commit the new ones to CVS, I got this error:

    The server reported an error while performing the “cvs commit” command. myproject: cvs server: failed to create lock directory for `/cvsrepositories/path_to/myproject’ (/cvsrepositories/path_to/myproject/subfolder/#cvs.lock): No such file or directory common: cvs server: lock failed – giving up myproject: cvs [server aborted]: lock failed – giving up – did not match any documents.

It turned out that the files had been previously stored in another CVS repository, with a different directory structure. Some of the directories still had CVS folders with pointers to the old repository directories and hostname.

Continue reading