--- Paul Sander <[EMAIL PROTECTED]> wrote: > In that case, commit your first merge to a new > branch and repeat the process > until you get in.
David might also be able to use the "advisory lock" patch (formerly known as reserved checkouts) available at SourceForge under project RCVS. Once installed, he could have himself "cvs edit -c" the files that're being merged and the rest of the developers "cvs edit -c", then "cvs ci -c" when they need to commit. Their "cvs edit" will abort if he is currently editing the file. If his "cvs edit" aborts, he can ask the other editors to "cvs unedit" the files (they can keep developing so long as they "cvs edit" before committing with "cvs ci -c". It would make things easier if everyone had "edit -c" and "checkin -c" in their ~/.cvsrc files. Doing this will serialize development on a per file basis rather than on a per repository basis. Noel __________________________________________________ Do You Yahoo!? Yahoo! Greetings - Send FREE e-cards for every occasion! http://greetings.yahoo.com _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
