Embedded Motion Control 2012 Group 6: Difference between revisions
Jump to navigation
Jump to search
| Line 6: | Line 6: | ||
* To add files, use <pre>svn add $FILENAME</pre> For multiple files, e.g. all C-files use <pre>svn add *.c</pre>Note: again, update only source files | * To add files, use <pre>svn add $FILENAME</pre> For multiple files, e.g. all C-files use <pre>svn add *.c</pre>Note: again, update only source files | ||
* If multiple files are edited simultaneously, more specifically the same part of a file, a conflict will arise. | * If multiple files are edited simultaneously, more specifically the same part of a file, a conflict will arise. | ||
*# use version A | |||
*# use version B | |||
*# show the differences | |||
==ToDo== | ==ToDo== | ||
Revision as of 14:19, 9 May 2012
SVN guidelines
- Always first update the SVN with the following command
svn up
- Commit only files that actually do work
- Clearly indicate what is changed in the file, this comes handy for logging purposes
- As we all work with the same account, identify yourself with a tag (e.g. [AJ], [DG], [DH], [JU], [RN])
- To add files, use
svn add $FILENAME
For multiple files, e.g. all C-files usesvn add *.c
Note: again, update only source files - If multiple files are edited simultaneously, more specifically the same part of a file, a conflict will arise.
- use version A
- use version B
- show the differences
ToDo
List of planned items.
- Finish tutorials (Week 2)
- Study information about sensors of the Jazz robot (Week 2)
Progress
Progress of the group. The newest item is listed on top.
- Week 1
- Started with tutorials (all)
- Installed ROS + Eclipse (all)
- Installed Ubuntu (all)
- Week 2
- Finished with tutorials (all)
- Practiced with simulator (all)
- Investigated sensor data(all)
If you are strong on the work, you do not have the time to update the wiki