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 using svn diff, I was wondering if anyone would object if I removed 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?
.hc
------------------------------------------------------------------------ ----
Terrorism is not an enemy. It cannot be defeated. It's a tactic. It's about as sensible to say we declare war on night attacks and expect we're going to win that war. We're not going to win the war on terrorism. - retired U.S. Army general, William Odom
Quoting Hans-Christoph Steiner hans@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.
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 hans@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-dev@iem.at http://lists.puredata.info/listinfo/pd-dev
On Wed, Aug 27, 2008 at 10:24 AM, ben@ekran.org wrote:
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.
The 'svn up' command takes an argument --diff3-cmd, which allows you to specify an external program to use for calculating merges. You could point it at a script which returns 'false' for .pd files, and passes other files through to 'diff'. I believe there's also a config file where you can set this so that you don't need to specify it every time.
Really it would be better if svn could be told not to auto-merge on update, but I think it can't. This made me think though: it would be a great project for someone to write a "Pd patch diff" program! :) To help visualize the diff between two patches. Could be fun...
Steve
Quoting Stephen Sinclair radarsat1@gmail.com:
Really it would be better if svn could be told not to auto-merge on
again i thought this is what svn:binary actually does on the client side. (as it flags diffs unusable, i guess there is a slightly different storing scheme on the server side which is less efficient than the default one).
update, but I think it can't. This made me think though: it would be a great project for someone to write a "Pd patch diff" program! :) To help visualize the diff between two patches. Could be fun...
definitely. any volunteers?
fgmasr IOhannes
---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.
On Aug 27, 2008, at 7:13 PM, Stephen Sinclair wrote:
On Wed, Aug 27, 2008 at 10:24 AM, ben@ekran.org wrote:
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.
The 'svn up' command takes an argument --diff3-cmd, which allows you to specify an external program to use for calculating merges. You could point it at a script which returns 'false' for .pd files, and passes other files through to 'diff'. I believe there's also a config file where you can set this so that you don't need to specify it every time.
Really it would be better if svn could be told not to auto-merge on update, but I think it can't. This made me think though: it would be a great project for someone to write a "Pd patch diff" program! :) To help visualize the diff between two patches. Could be fun...
I wrote pd-diff, which is a minor improvement, it's in pure-data/ scripts/pd-diff.
.hc
Steve
Pd-dev mailing list Pd-dev@iem.at http://lists.puredata.info/listinfo/pd-dev
------------------------------------------------------------------------ ----
If nature has made any one thing less susceptible than all others of exclusive property, it is the action of the thinking power called an idea, which an individual may exclusively possess as long as he keeps it to himself; but the moment it is divulged, it forces itself into the possession of everyone, and the receiver cannot dispossess himself of it. - Thomas Jefferson
Quoting Hans-Christoph Steiner hans@eds.org:
I wrote pd-diff, which is a minor improvement, it's in pure-data/ scripts/pd-diff.
that sounds great; i gonna have a look at it
fgmasr IOhannes
---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.
zmoelnig@iem.at wrote:
Quoting Hans-Christoph Steiner hans@eds.org:
I wrote pd-diff, which is a minor improvement, it's in pure-data/ scripts/pd-diff.
that sounds great; i gonna have a look at it
i am having a hard time trying to make it run: what is "tail +2" suposed to do?
it doesn't seem to comply to any "tail" i know of. mine usually allow "tail -2" (get the last two lines), or "tail -c +2" (start the display at the 2nd byte of the input); which one did you have in mind?
fgmasdr IOhannes
On Sep 3, 2008, at 6:09 AM, IOhannes m zmoelnig wrote:
zmoelnig@iem.at wrote:
Quoting Hans-Christoph Steiner hans@eds.org:
I wrote pd-diff, which is a minor improvement, it's in pure-data/ scripts/pd-diff.
that sounds great; i gonna have a look at it
i am having a hard time trying to make it run: what is "tail +2" suposed to do?
it doesn't seem to comply to any "tail" i know of. mine usually allow "tail -2" (get the last two lines), or "tail -c +2" (start the display at the 2nd byte of the input); which one did you have in mind?
I guess the BSD one. http://www.ss64.com/bash/tail.html
-COUNT +COUNT This option is only recognized if it is specified first. COUNT is a decimal number optionally followed by a size letter (`b', `k', `m') as in `-c', or `l' to mean count by lines, or other option letters (`cfqv').
If there is more standard syntax for that, feel free to change it.
.hc
fgmasdr IOhannes
Pd-dev mailing list Pd-dev@iem.at http://lists.puredata.info/listinfo/pd-dev
------------------------------------------------------------------------ ----
"Free software means you control what your computer does. Non-free software means someone else controls that, and to some extent controls you." - Richard M. Stallman
Hans-Christoph Steiner wrote:
I guess the BSD one. http://www.ss64.com/bash/tail.html
-COUNT +COUNT This option is only recognized if it is specified first. COUNT is a decimal number optionally followed by a size letter (`b', `k', `m') as in `-c', or `l' to mean count by lines, or other option letters (`cfqv').
If there is more standard syntax for that, feel free to change it.
thanks for the link; i still don't understand what it is supposed to be doing (ah, my bad english!), but tests on OSX seem to indicate, that "tail +2" will display everything _but_ the first line. is this the behaviour you intended?
fgamrd IOhannes
On Sep 4, 2008, at 4:34 AM, IOhannes m zmoelnig wrote:
Hans-Christoph Steiner wrote:
I guess the BSD one. http://www.ss64.com/bash/tail.html -COUNT +COUNT This option is only recognized if it is specified first. COUNT is a decimal number optionally followed by a size letter (`b', `k', `m') as in `-c', or `l' to mean count by lines, or other option letters (`cfqv'). If there is more standard syntax for that, feel free to change it.
thanks for the link; i still don't understand what it is supposed to be doing (ah, my bad english!), but tests on OSX seem to indicate, that "tail +2" will display everything _but_ the first line. is this the behaviour you intended?
fgamrd IOhannes
Honestly, I don't remember why, but it did work.
.hc
------------------------------------------------------------------------ ----
'You people have such restrictive dress for women,’ she said, hobbling away in three inch heels and panty hose to finish out another pink-collar temp pool day. - “Hijab Scene #2", by Mohja Kahf
On Aug 27, 2008, at 9:42 AM, zmoelnig@iem.at wrote:
Quoting Hans-Christoph Steiner hans@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.
I thought that this was part of the reason why we upgraded to SVN, useful conflict resolution tools. :) Since on a merge, SVN automatically provides you with four files to assist the merge, I think this feature is quite useful with Pd as well. The CVS-style merged file is not so useful (i.e. the one with <<<<<< and >>>>>> in it), but the three copies of the file that has a conflict are very useful. You can open up the two revisions.
See the "Resolve Conflicts" section of the SVN book: http://svnbook.red-bean.com/en/1.0/ch03s05.html
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)
I use diff to see differences between versions, what else? ;-P
.hc
fmadsr IOhannes
This message was sent using IMP, the Internet Messaging Program.
------------------------------------------------------------------------ ----
All information should be free. - the hacker ethic
On Aug 27, 2008, at 4:51 PM, Hans-Christoph Steiner wrote:
On Aug 27, 2008, at 9:42 AM, zmoelnig@iem.at wrote:
Quoting Hans-Christoph Steiner hans@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.
I thought that this was part of the reason why we upgraded to SVN, useful conflict resolution tools. :) Since on a merge, SVN automatically provides you with four files to assist the merge, I think this feature is quite useful with Pd as well. The CVS-style merged file is not so useful (i.e. the one with <<<<<< and >>>>>> in it), but the three copies of the file that has a conflict are very useful. You can open up the two revisions.
See the "Resolve Conflicts" section of the SVN book: http://svnbook.red-bean.com/en/1.0/ch03s05.html
Doh, of course, I forgot that this only happens when there is a conflict. So the question is how to trigger this behavior with Pd patches without disabling diff support...
.hc
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)
I use diff to see differences between versions, what else? ;-P
.hc
fmadsr IOhannes
This message was sent using IMP, the Internet Messaging Program.
All information should be free. - the hacker ethic
------------------------------------------------------------------------ ----
"Free software means you control what your computer does. Non-free software means someone else controls that, and to some extent controls you." - Richard M. Stallman
Quoting Hans-Christoph Steiner hans@eds.org:
I thought that this was part of the reason why we upgraded to SVN, useful conflict resolution tools. :) Since on a merge, SVN
i cannot remember that argument; it would have been a very good one, but unfortunately i am not really aware of it.
automatically provides you with four files to assist the merge, I think this feature is quite useful with Pd as well. The CVS-style merged file is not so useful (i.e. the one with <<<<<< and >>>>>> in it), but the three copies of the file that has a conflict are very useful. You can open up the two revisions.
right, that's definitely an improvement over the CVS style. (but i wouldn't go as far and call it a "useful conflict resolution tool").
without reading tfm (it's rather late by now), i wonder how this is related to the svn:binary flag. i guess this flag will still produce conflicts (if there are any) in the way you described. correct?
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)
I use diff to see differences between versions, what else? ;-P
fair enough. my argument was rather along the line, that diff can only be used to track trivial changes. anything else will just not work.
mfgdsr IOhannes
---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.
Quoting Hans-Christoph Steiner hans@eds.org:
using svn diff, I was wondering if anyone would object if I removed the binary mime-type from all .pd files in SVN.
after a brief glance at the pd-cvs list, i am wondering why you have asked this obviously rhetoric question in the first place.
fgmadsr IOhannes
---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.
On Aug 27, 2008, at 9:33 PM, zmoelnig@iem.at wrote:
Quoting Hans-Christoph Steiner hans@eds.org:
using svn diff, I was wondering if anyone would object if I removed the binary mime-type from all .pd files in SVN.
after a brief glance at the pd-cvs list, i am wondering why you have asked this obviously rhetoric question in the first place.
I thought it was a leftover from CVS, sorry. There are still many more that are still set as binary.
.hc
fgmadsr IOhannes
This message was sent using IMP, the Internet Messaging Program.
Pd-dev mailing list Pd-dev@iem.at http://lists.puredata.info/listinfo/pd-dev
------------------------------------------------------------------------ ----
"It is convenient to imagine a power beyond us because that means we don't have to examine our own lives.", from "The Idols of Environmentalism", by Curtis White
Hans-Christoph Steiner wrote:
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 using svn diff, I was wondering if anyone would object if I removed 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?
btw, shan't we actually use application/x-puredata or application/x-pd (as Pd-extended does)?
fgmadsr IOhannes
-
ben＠ekran.org -
Hans-Christoph Steiner -
IOhannes m zmoelnig -
Stephen Sinclair -
zmoelnig＠iem.at