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.
On Mon, 16 Feb 2004 14:13:47 +0100, "Bo Berglund" <Bo.Berglund at system3r.se> wrote: >1) What is the exact correct command to give to make the switch 1.8->1.9 > that makes the file text from then on? cvs admin -kkv Form.dfm then edit, commit as usual. The new revision will inherit the options from the admin -k. >2) What will happen if I update an existing sandbox to retrieve the file > in revision 1.3? Will it be marked in my sandbox as a text or binary > file? Yes. >3) What happens if I have a branch based on 1.4, which needs to be merged > into Trunk when HEAD is in 1.11? There's a binary->text merge, which will probably just create a conflict. Not sure I'd recommend it... Note that there's only a single 'default' -k option for each file which is used on new checkins. This means that you can't have a binary branch and a text branch simultaneously - it's a limitation of the current implementation, which is on the list of things to fix. >4) What will happen if the branch is based on rev 1.7 instead? Same a 3) >My tests with CVS version 2.0.11 (client and server) are mixed blessings, >it seems like the file will be marked as -kt as opposed to nothing for a >normal text file. And the update to a binary revision does not change this >at least not in my WinCvs version. It should update the type when you go to a binary revision automatically (unless you use update -k to force it). If it doesn't there's possibly a bug. Tony