Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
kerry richard wrote: > Howeever, if User2 attempts a 'cvs edit' on the Branch1 version of the > file, it succeeds ! > This I find surprising..... Not really... logically they're separate (but related) files. It's wouldn't be an unusual situation to have two developers working on different branches - there's no reason for them to have to wait for each other. > Is there another mode whereby edit locks happen over all branches of a > file ? edit -w will lock the whole file. OTOH there really is no need for it - edits on different branches simply don't interact. If you're doing a cross-branch merge then you're going to have to deal with nonmergable files anyway.. edit does not help with this. Tony