Re: [sc-dev] Re: patches for trunk

[Josh Parmenter <josh@xxxxxxxxxxxxxxxxx>]

On Dec 4, 2009, at 9:28 AM, Tim Blechmann wrote:
> 
> you can try to figure this out, by compiling different git revisions.
> something like:
> 
> git checkout sclang64
> git bisect start
> git bisect bad
> git checkout 896770e3204b9a98859c59d44a80bd00d464d416 # trunk
> # make sure, that the problem does not occur with trunk

as I got to this step, I get:
git checkout 896770e3204b9a98859c59d44a80bd00d464d416
error: You have local changes to 'Source/app/CocoaBridgePrimitives.M'; cannot switch branches.
Ringo-2:supercollider

probably because of the changes I just sent you in the patch??? Should I --force the checkout?

Best,

Josh

******************************************
/* Joshua D. Parmenter
http://www.realizedsound.net/josh/

“Every composer – at all times and in all cases – gives his own interpretation of how modern society is structured: whether actively or passively, consciously or unconsciously, he makes choices in this regard. He may be conservative or he may subject himself to continual renewal; or he may strive for a revolutionary, historical or social palingenesis." - Luigi Nono
*/


_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: https://listarc.bham.ac.uk/marchives/sc-dev/
search: https://listarc.bham.ac.uk/lists/sc-dev/search/