Re: [PD-dev] Treating .pd-files as binaryin CVS

Frank Barknecht wrote:

Hallo,

I wonder how I could test that reliably. I already tried to make some simple changes to Pd files like deleting objects. commiting the changes to a svn-repository, replacing the changed file with the previous version and and running update afterwards did work, so it seems. (Is this merging?) At least the patch was functional and was

no it is not. (but you are patching the pd file, which works ;-))

1. create a pd-file 2. make a backup-copy 3. change the original pd-file 4. commit it to the svn/cvs 5. replace the (changed) original file with the backup. 6. change the backup copy 7. update from the cvs

this should produce a merge.

mfg.as.dr IOhannes