[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: CVS files merging procedure

From: Mark Hoogenboom
Subject: Re: CVS files merging procedure
Date: Tue, 13 Dec 2005 08:52:08 +0000
User-agent: Mozilla/5.0 (X11; U; SunOS sun4u; en-US; rv:1.7) Gecko/20041221

In this case, can the developers solve any conflicts between the HEAD and the branch they are checking in to, or will that always be up to the check-in person? The only way I see is: the developers do the merging up to the actual commit and then hand over the working space to the check-in person to check and commit - but isn't "handing over" a workspace violating some CVS principles?


CVS can still support this mode of working, if you use the cvs_acls
script, allow only the administrator (or check-in person) to check into
HEAD, and allow developers to freely check into any branches.

- --
Jim Hyslop
Dreampossible: Better software. Simply.
                Consulting * Mentoring * Training in
   C/C++ * OOD * SW Development & Practices * Version Management

reply via email to

[Prev in Thread] Current Thread [Next in Thread]