Concurrent Changes (CVS) Mode - Introduction

Top  Previous  Next

Branching is designed for long-term concurrent development. Sometimes, concurrency is required on a daily basis. The CS-RCS CVS mode is designed for daily concurrent development, and supports automatic merging whenever possible. You can select the CVS mode for any project.

The CVS mode is useful in the following scenarios:

·

The current development phase includes minor fixes to many files.

·

Merging and conflict resolving is not complex.

·

The Exclusive Locks mode is too restrictive.

·

When working with projects located on CVS servers, CVS mode is default as the server is optimized to work in CVS mode.

CS-RCS does not perform automatic merging on binary files. Therefore, by default, binary files are set to the Exclusive Locks mode even when the project is in the CVS mode. You may change this in the Advanced tab of the Project Properties dialog. However, this may result in merge conflicts which are hard to resolve.

Note: This chapter is only applicable for the Pro edition of CS-RCS.