atom feed17 messages in at.iem.pd-devRe: [PD-dev] removing binary mime-typ...
FromSent OnAttachments
Hans-Christoph SteinerAug 26, 2008 10:07 pm 
zmoe...@iem.atAug 27, 2008 6:41 am 
be...@ekran.orgAug 27, 2008 7:24 am 
Hans-Christoph SteinerAug 27, 2008 1:51 pm 
Stephen SinclairAug 27, 2008 4:13 pm 
Hans-Christoph SteinerAug 27, 2008 4:31 pm 
zmoe...@iem.atAug 27, 2008 5:55 pm 
zmoe...@iem.atAug 27, 2008 5:57 pm 
zmoe...@iem.atAug 27, 2008 6:33 pm 
Hans-Christoph SteinerAug 28, 2008 5:29 pm 
Hans-Christoph SteinerAug 28, 2008 5:30 pm 
zmoe...@iem.atAug 29, 2008 8:40 pm 
IOhannes m zmoelnigSep 2, 2008 8:27 am 
IOhannes m zmoelnigSep 3, 2008 3:09 am 
Hans-Christoph SteinerSep 3, 2008 6:46 am 
IOhannes m zmoelnigSep 4, 2008 1:34 am 
Hans-Christoph SteinerSep 4, 2008 8:48 pm 
Subject:Re: [PD-dev] removing binary mime-type from .pd files in SVN
From:be...@ekran.org (be@ekran.org)
Date:Aug 27, 2008 7:24:19 am
List:at.iem.pd-dev

I keep forgetting to mark pd files as binary in my school svn and that often leads to svn attempting to merge them, which never works and requires manually editing the files.

..b..

Quoting Hans-Christoph Steiner <ha@eds.org>:

Hey all,

A number of people set the CVS binary flag on .pd files to prevent merges. Since AFAIK, this isn't necessary with SVN and this prevents

as i understand it, it is still necessary with svn.

using svn diff, I was wondering if anyone would object if I removed

well, from the revision control system's point of view i think that a "merge" is closely related to a "diff" (the latter being the inverse of the former)

the binary mime-type from all .pd files in SVN.

Or is there some other reason to set .pd files to a mime-type of application/octal?

so the reason why i (inconsistently) tag pd-patches as "binary" is in order to prevent merging. if you have any other way to prevent merging of pd-patches please do so. i would also be interested in any way that prevents merging and allows diffs at the same time.

and finally: why do you need diffs of Pd patches? (well, i sometimes like them to see if only very minor changes - e.g. the patch window has a new position - occured)

fmadsr IOhannes

---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.

_______________________________________________ Pd-dev mailing list Pd-@iem.at http://lists.puredata.info/listinfo/pd-dev