<div dir="ltr">Thanks for the replies, that's what I feared :)<div><br><div style>Joe, I like your suggestions about abstractions and $0, thanks! </div></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">
On Wed, Apr 17, 2013 at 10:34 AM, Joe White <span dir="ltr"><<a href="mailto:white.joe4@gmail.com" target="_blank">white.joe4@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi Rafa,<div><br></div><div>+1 on what Roman said. </div><div><br></div><div>We use Pure Data and Git a lot in our projects and you might find you have more luck organising a useable workflow in your team rather than trying to automatically diff/merge patches. </div>
<div><br></div><div>Here's some of the things we do:</div><div><br></div><div>- Split up your code into abstractions instead of sub-patches, treating them like classes. (use $0 passing to ensure communication - also makes your patch local so you could run multiple instances.)</div>
<div><br></div><div>- Split tasks so that only one developer works on an abstraction at any one time. Sometimes it's unavoidable but manual merges happen in bigger projects in other languages anyway. </div><div><br></div>
<div>- When committing make sure that only the desired files are added.</div><div><br></div><div>Hope that helps,</div><div>Joe</div><div><div><div class="h5"><br><div class="gmail_quote">On 17 April 2013 15:54, Roman Haefeli <span dir="ltr"><<a href="mailto:reduzent@gmail.com" target="_blank">reduzent@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div>On Wed, 2013-04-17 at 09:27 -0500, Rafael Vega wrote:<br>
<br>
<br>
> Can anyone provide tips on how to diff two pd patches to find<br>
> differences quickly so that conflicts can be fixed by hand without<br>
> spending too much time trying to find differences?<br>
<br>
</div>I think there is no way to sanely handle that. I treat .pd files as<br>
binary files in this regard. One small change can change the whole file.<br>
The objects within a patch are identified and ordered by an<br>
automatically given integer number. A small change might cause many<br>
objects to be renumbered without any relation to the previous version.<br>
Such a diff might be huge even if the change is very small.<br>
<br>
I think you are left with avoiding conflicts whenever possible as Pd<br>
patches cannot be diff'd and merged in a meaningful way.<br>
<br>
Roman<br>
<br>
<br>
<br>
_______________________________________________<br>
<a href="mailto:Pd-list@iem.at" target="_blank">Pd-list@iem.at</a> mailing list<br>
UNSUBSCRIBE and account-management -> <a href="http://lists.puredata.info/listinfo/pd-list" target="_blank">http://lists.puredata.info/listinfo/pd-list</a><br>
</blockquote></div><br><br clear="all"><div><br></div></div></div><span class="HOEnZb"><font color="#888888">-- <br>Follow me on Twitter @diplojocus
</font></span></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Rafael Vega<br><a href="mailto:email.rafa@gmail.com" target="_blank">email.rafa@gmail.com</a>
</div>