KIELER meeting 9 Feb 2012

start: 14:30 h, end: 16:20

attendants: msp, cds, cmot, ckru, chsch, rvh, sgu, ssc, alb, ima

protocol: ima

topics:

• git console
• git in Eclipse
• demo by ckru
• demo by sgu
• demo by cmot

git console

demo by msp setting:

• "demo" and demo clone on server
• msp has local clone with origin demo clone
• friend has local clone with origin demo

interactions:

• msp edits new file, with commands add, commit and push on server clone
• msp creates branch "experimental" with command git branch experimental; has branches master and experimental now, actual branch is still master! - has to be switched explicitly
• msp edits first file, adds a new one, adds and commits
• friend edits new file and pushes it to the server
• msp would like to have these changes, two possibilities: ask friend to push on serverclone or help oneself
• problem: friend cannot push to server clone, as msp has changed it, needs pulling and a merge commit, then push
• msp fetches, checks changes and merges, master can be fast forwarded, git merge origin master
• checkout experimental, git merge master: changes are in experimental now (has 2 predecessors)
• msp commits new changes
• friend has changes as well, he commits and pushes
• msp wants to get the changes by himself now:
• git remote add mainline <URL>
• git fetch mainline
• git checkout master (not origin) (local master on status of mainline)
• git merge experimental
• push to mainline, git push mainline master
• friend sees changes with git pull origin master

question and answer: Is it possible to get a single file? - No, but it is possible to remove everything not needed from a branch. This renders normal merging impossible, cherrypick has to be used.

general tip: keep commits small, communicate, if conflicts occur

git for Eclipse

chsch proposes to use merge rebase for updating an experimental branch if there are changes you do not want to merge in; rebase enables you to update and put your commits "on top" again. do not push to upstream, if you do not want experimental in mainline, use push (and use next as well). config file has standard values for git pull and git push

demo by ckru

• KSbase: added creation of a default SyncChart? to avoid empty SyncCharts?; one state with a nested state, named after file; if everything is deleted, a default chart appears
• this can be switched of
• former KSBase entry will be removed

demo by sgu

• synthesis of data flow diagrams
• annotated C-programs
• uses doxygen, kaom code
• program accepts path to source and path for kaom data as arguments
• hierarchy: functions contain functions
• small discussions on labels: should be arbitrary; content: Ga:a ""; Gb:g2 "some label";

demo by cmot

• connect esterel to KIELER
• CEC connection, reused and expanded old attempts
• now interactive simulation possible!