h44z/uibk_703807-Advanced-CXX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assignment 1: Change example graph format to be less ambiguous

Browse Source
This commit is contained in:
Alex Hirsch 2020-11-09 23:28:16 +01:00
parent b6222cc607
commit 45a81d8927
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assignment1/README.md
View File

@ -140,10 +140,10 @@ You don't have to follow the exact format of this example:
```
$ lit log
o─┐ ← r3 "Merge r2 with r1"
│ o r2 "Add chocolate egg dispenser"
o │ r1 "Add coin operated self destruct feature"
o─┘ r0 "First Commit"
o←┐ ← r3 "Merge r2 with r1"
│ └o r2 "Add chocolate egg dispenser"
o │ r1 "Add coin operated self destruct feature"
o──┘ r0 "First Commit"
```
## Implementation

46
assignment1/lit-test
View File

@ -91,9 +91,9 @@ EOF
# This should be r3.
lit commit "Add file2"
# o ← r3 Add file2
# │ o r2 Extend file1 even further
# │ o r1 Extend file1
# o ← r3 Add file2
# o │ r2 Extend file1 even further
# o │ r1 Extend file1
# o─┘ r0 Add file1
lit log
@ -114,11 +114,11 @@ diff -s subfolder/file2 - <<-EOF
And another line in the second file.
EOF
# o─┐ ← r4 Merge r3 into r2
# │ o r3 Add file2
# o │ r2 Extend file1 even further
# o │ r1 Extend file1
# o─┘ r0 Add file1
# o←┐ ← r4 Merge r3 into r2
# │ └o r3 Add file2
# o │ r2 Extend file1 even further
# o │ r1 Extend file1
# o──┘ r0 Add file1
lit log
echo "== Setting up a conflict"
@ -129,13 +129,13 @@ lit checkout r3
echo >>file1 "Third line on top of r3."
lit commit "Extend file1 another way" # r6
# o ← r6 Extend file1 another way
# o │ r5 Extend file1 one way
# o─┤ r4 Merge r3 into r2
# │ o r3 Add file2
# o │ r2 Extend file1 even further
# o │ r1 Extend file1
# o─┘ r0 Add file1
# o ← r6 Extend file1 another way
# o │ r5 Extend file1 one way
# o←┐│ r4 Merge r3 into r2
# │ └o r3 Add file2
# o │ r2 Extend file1 even further
# o │ r1 Extend file1
# o──┘ r0 Add file1
lit log
# Going back and merging.
@ -184,14 +184,14 @@ diff -s file1 - <<-EOF
Sixth line added during merge conflict.
EOF
# o─┐ ← r7 Merge r6 into r5
# │ o r6 Extend file1 another way
# o │ r5 Extend file1 one way
# o─┤ r4 Merge r3 into r2
# │ o r3 Add file2
# o │ r2 Extend file1 even further
# o │ r1 Extend file1
# o─┘ r0 Add file1
# o←┐ ← r7 Merge r6 into r5
# │ └─o r6 Extend file1 another way
# o │ r5 Extend file1 one way
# o←┐ │ r4 Merge r3 into r2
# │ └─o r3 Add file2
# o │ r2 Extend file1 even further
# o │ r1 Extend file1
# o───┘ r0 Add file1
lit log
echo "== Cleanup"