How can I keep the revision numbers of my local check-ins from conflicting with revision numbers originating at the master site?
It is difficult, because CVS chooses the revision numbers itself. One way around this is to modify CVS slightly. Before discussing that, though, the first rule of thumb is to create a new branch to hold your local changes. Don’t try to check your local changes into the main branch or a branch that exists in the master repository. Doing so would make revision number collisions very likely, sooner or later. If your local revisions are on their own branch, then the problem is reduced to ensuring that your branch has a unique revision number which will never be duplicated in the master repository. The easiest way to accomplish this is to modify CVS. The version of CVS released with FreeBSD includes such a modification. In that version, you can influence the revision numbers of branches by setting the environment variable CVS_LOCAL_BRANCH_NUM. This variable should be set to an integer value, and CVS will use that as the starting point when choosing revision numbers for new branches. By defa
Related Questions
- How can I keep the revision numbers of my local check-ins from conflicting with revision numbers originating at the master site?
- Can I check my own local changes into a CVS repository that I update with CVSup from a master site?
- How do I find out the local dialup numbers for the Bell Nexxia.IP Connect service?