Книга: Embedded Linux development using Eclipse

8.2.1 Branches

8.2.1 Branches

CVS is based on the notion of branches, where programming teams can share and integrate ongoing work. A branch is a shared work area that can be updated at any time by any member of the team. This allows individuals to share their own work with other members of the team and to access the work of others during all stages of a project. The branch effectively represents the current shared state of the project.

The process is illustrated graphically in Figure 8.17. Two programmers each check files out of the branch, update them, and commit them back to the branch. It is entirely possible that both programmers are working on the same file. Both programmers need to synchronize the file to check for conflicting changes before committing.

Figure 8.17: CVS workflow.

Every CVS repository has a special branch called HEAD that is the main branch. HEAD, also referred to as the trunk, is considered sacrosanct. You don’t commit something to HEAD until you are absolutely certain that it’s correct. Other branches are created to provide a safe place to make changes before committing file to the HEAD branch.

Оглавление книги