[CCC DEV] Servo stuff committed

[Dennis Meade]

I thought I had rebuilt from the top starting with "autoreconf -vfi".  
I'll try it again.

I realized that I  should have used svn:ignore after I did the commit. 
Perhaps that should be set in the runtime configuration?

Dennis

Did you rebuild and reinstall the firmware? Doing a "make upload" in the
> "occam" directory will only upload your occam program, not the
> Transterpreter firmware; try doing a "make upload" in the "tvm/arduino"
> directory.
>
> Looking at your merge:
>    https://projects.cs.kent.ac.uk/projects/kroc/trac/changeset/6498/kroc/branches/avr-servo
>
> you appear to have successfully merged in all the changes necessary to
> get the better debugging output, so rebuilding and uploading the
> firmware should do the job.
>
> However, in that commit you've also added all the generated files from
> the project (e.g. the .tce and .tbc files) to the repository, which will
> cause problems later -- did you do a "svn add -R" at the top level or
> something? It's usually a good idea to check with "svn status" before
> you commit a merge to make sure that it's only touching the files that
> changed during the merge; in this case you would have seen that it was
> adding lots of files that hadn't been modified on trunk. You could
> reverse those changes with another commit, but since you've only made
> that one commit on the branch, it may be better to just start again with
> a fresh branch and get rid of that one once you've copied over the new
> code you've written...
>
>    


-- 
Dennis

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.concurrency.cc/pipermail/developers/attachments/20100618/acd03705/attachment.htm>