hampsterx Posted December 21, 2011 Report Share Posted December 21, 2011 hi there, We have unsupported file types (cfc/cfm) which show up as binary type so the merge tool no worky. In the client preferences "diff tools" tab you can add rules based on file type. I added them using "plastic SCM diff tool" and moved them above the $binary rule. Restarted client but it seems to have no effect Cheers, TiM Link to comment Share on other sites More sharing options...
manu Posted December 21, 2011 Report Share Posted December 21, 2011 If this files are Text files your can right click on the item -> "Change revison type" -> "Text". The diff tool should work with this change. Manu. Link to comment Share on other sites More sharing options...
hampsterx Posted December 21, 2011 Author Report Share Posted December 21, 2011 thats great except its not practical when you have 5k of files Tempted to script it from command line/cm tool but thought I would ask first. Link to comment Share on other sites More sharing options...
manu Posted December 22, 2011 Report Share Posted December 22, 2011 Wooo wooo wait there's an easier way!! Stop the script!! xD http://codicesoftware.blogspot.com/2008/03/custom-file-types.html Link to comment Share on other sites More sharing options...
carpediemevive Posted December 23, 2011 Report Share Posted December 23, 2011 Does this work for files that have already been committed? I thought I read somewhere that files which were committed with a binary file type have to be changed manually. Link to comment Share on other sites More sharing options...
manu Posted December 23, 2011 Report Share Posted December 23, 2011 The filetypes.conf file is only used to know if its a binary or text file by the diff tool. The revision type is not changed, so if the file was commited as binary you can use the filetypes file to declare it "text" for the diff tool but it will be binary for plastic. Link to comment Share on other sites More sharing options...
carpediemevive Posted December 23, 2011 Report Share Posted December 23, 2011 Good to know! Thanks! Link to comment Share on other sites More sharing options...
psantosl Posted December 29, 2011 Report Share Posted December 29, 2011 There's also a way to script it easily... Manu, Borja wrote a forum answer about how to script the "change type" from CLI... you should add it to the knowledge base I think. Link to comment Share on other sites More sharing options...
hampsterx Posted January 18, 2012 Author Report Share Posted January 18, 2012 *link* please Link to comment Share on other sites More sharing options...
dave Posted January 19, 2012 Report Share Posted January 19, 2012 IIRC, it was something like this: for /F %i in ('dir *.cfm') do cm changerevisiontype -type=txt %i Cheers! David Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.