Summary

• Page properties (2 modified, 0 added, 0 removed)
• Attachments (0 modified, 6 added, 0 removed)
  • examples.txt
  • notes.txt
  • turing-graph-01.png
  • turing-graph-02.png
  • turing-graph-03.png
  • turing-graph-04.png
• Objects (1 modified, 0 added, 0 removed)
  • Confluence.Code.ConfluencePageClass[0]

Details

Page properties

Parent

...	...	@@ -1,0 +1,1 @@
	1	+WS12EclPract.Eclipse Practical (winter term 201213).Tutorials.WebHome

Content

...	...	@@ -6,7 +6,7 @@
6	6
7	7
8	8
9		-{{toc style="circle" maxLevel="2"/}}
	9	+{{toc maxLevel="2" style="circle"/}}
10	10
11	11	= Creating Commits =
12	12
...	...	@@ -212,7 +212,7 @@
212	212	Switched to branch 'sketches'
213	213	{{/noformat}}
214	214
215		-Add the line "{{code language="none"}}Move one step left:{{/code}}" and write an updated version of the tape with tape head in the file {{code language="none"}}examples.txt{{/code}}, then commit.
	215	+Add the line "{{code language="none"}}Move one step left:{{/code}}" followed by an accordingly updated version of the tape with tape head at the end of the file {{code language="none"}}examples.txt{{/code}}, then commit.
216	216
217	217	{{noformat}}
218	218	$ git add examples.txt
...	...	@@ -233,7 +233,7 @@
233	233	1 files changed, 2 insertions(+), 1 deletions(-)
234	234	{{/noformat}}
235	235
236		-Using {{code language="none"}}gitk{{/code}} you can see that a new commit was created that has two parent commits. Such a commit is called //merge// commit and is done automatically when a non-fast-forward merge is applied.
	236	+Using {{code language="none"}}gitk{{/code}} you can see that a new commit was created that has two parent commits. Such a commit is called //merge// commit and is done automatically when a non-fast-forward merge is applied. See how both the change to {{code language="none"}}notes.txt{{/code}} done in the {{code language="none"}}master{{/code}} branch and the change to {{code language="none"}}examples.txt{{/code}} done in the {{code language="none"}}sketches{{/code}} branch are now contained in the repository state that results from the merge.
237	237	)))
238	238	1. (((
239	239	Add a commit in each of the two branches using the commands you have already learned.

examples.txt

Author

...	...	@@ -1,0 +1,1 @@
	1	+XWiki.XWikiGuest

Size

...	...	@@ -1,0 +1,1 @@
	1	+192 bytes

Content

...	...	@@ -1,0 +1,21 @@
	1	+Empty tape with tape head:
	2	+
	3	+ V
	4	+----------------
	5	+
	6	+Write character "a":
	7	+
	8	+ V
	9	+----a-----------
	10	+
	11	+Move one step right:
	12	+
	13	+ V
	14	+----a-----------
	15	+
	16	+Write character "b":
	17	+
	18	+ V
	19	+----ab----------
	20	+
	21	+

notes.txt

Author

...	...	@@ -1,0 +1,1 @@
	1	+XWiki.XWikiGuest

Size

...	...	@@ -1,0 +1,1 @@
	1	+142 bytes

Content

...	...	@@ -1,0 +1,6 @@
	1	+ * A tape with fixed length
	2	+ * Tape head can read or write data
	3	+ * Tape head can move left or right
	4	+ * The head is controlled by ... (TODO)
	5	+
	6	+

turing-graph-01.png

Author

...	...	@@ -1,0 +1,1 @@
	1	+XWiki.XWikiGuest

Size

...	...	@@ -1,0 +1,1 @@
	1	+2.9 KB

Content

turing-graph-02.png

Author

...	...	@@ -1,0 +1,1 @@
	1	+XWiki.XWikiGuest

Size

...	...	@@ -1,0 +1,1 @@
	1	+5.4 KB

Content

turing-graph-03.png

Author

...	...	@@ -1,0 +1,1 @@
	1	+XWiki.XWikiGuest

Size

...	...	@@ -1,0 +1,1 @@
	1	+2.5 KB

Content

turing-graph-04.png

Author

...	...	@@ -1,0 +1,1 @@
	1	+XWiki.XWikiGuest

Size

...	...	@@ -1,0 +1,1 @@
	1	+2.1 KB

Content

Confluence.Code.ConfluencePageClass[0]

Id

...	...	@@ -1,1 +1,1 @@
1		-2982178
	1	+2982081

URL

...	...	@@ -1,1 +1,1 @@
1		-https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/WS12EclPract/pages/2982178/Git
	1	+https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/WS12EclPract/pages/2982081/Git