for f in $(ls); do mv $f ${f:0:${#f}-5}; done
for f in $(ls); do unzip $f; done
rm *.zip



git init

cp $(find ../commit0) .
git add -A
git commit -a --author="Konstantin <Kosty.Fomin98@yandex.ru>"  -m "r0"


cp $(find ../commit1) .
git add -A
git commit -a --author="Konstantin <Kosty.Fomin98@yandex.ru>"  -m "r1"

git checkout -b second
cp $(find ../commit2) .
git add -A
git commit -a --author="BEZDYALNIK <Ilya.Koval@nichegoNeDelal.ru>"  -m "r2"

git checkout master
cp $(find ../commit3) .
git add -A
git commit -a --author="BEZDYALNIK <Ilya.Koval@nichegoNeDelal.ru>"  -m "r3"

git checkout second
cp $(find ../commit4) .
git add -A
git commit -a --author="Konstantin <Kosty.Fomin98@yandex.ru>"  -m "r4"

git checkout master
cp $(find ../commit5) .
git add -A
git commit -a --author="Konstantin <Kosty.Fomin98@yandex.ru>"  -m "r5"

git checkout -b third
cp $(find ../commit6) .
git add -A
git commit -a --author="BEZDYALNIK <Ilya.Koval@nichegoNeDelal.ru>"  -m "r6"

cp $(find ../commit7) .
git add -A
git commit -a --author="BEZDYALNIK <Ilya.Koval@nichegoNeDelal.ru>"  -m "r7"

git checkout master
cp $(find ../commit8) .
git add -A
git commit -a --author="BEZDYALNIK <Ilya.Koval@nichegoNeDelal.ru>"  -m "r8"


git checkout third
cp $(find ../commit9) .
git add -A
git commit -a --author="BEZDYALNIK <Ilya.Koval@nichegoNeDelal.ru>"  -m "r9"

cp $(find ../commit10) .
git add -A
git commit -a --author="Konstantin <Kosty.Fomin98@yandex.ru>"  -m "r10"


git checkout second
cp $(find ../commit11) .
git add -A
git commit -a --author="BEZDYALNIK <Ilya.Koval@nichegoNeDelal.ru>"  -m "r11"


git checkout third
cp $(find ../commit12) .
git add -A
git commit -a --author="Konstantin <Kosty.Fomin98@yandex.ru>"  -m "r12"

git checkout second
git merge third
vim A.java
vim H.java
vim *
git add -A
git commit -a --author="Konstantin <Kosty.Fomin98@yandex.ru>"  -m "Resolved merge conflict"

cp $(find ../commit13) .
git add -A
git commit -a --author="Konstantin <Kosty.Fomin98@yandex.ru>"  -m "r13"

git chekout master
git merge second
cp $(find ../commit14) .
git add -A
git commit -a --author="Konstantin <Kosty.Fomin98@yandex.ru>"  -m "r14"


SVN

svnadmin create .

svn import . "file:///Users/Konstantin/Documents/OPILab2/SVN/trunk" -m "Initial commit" --username=kosty

svn co "file:///Users/Konstantin/Documents/OPILab2/SVN/trunk" .

cp $(find ../commit0) .
svn add * --force
svn commit --username="kosty" -m "r0"
svn up

cp $(find ../commit1) .
svn add * --force
svn commit --username="kosty" -m "r1"
svn up

svn copy --parents "file:///Users/Konstantin/Documents/OPILab2/SVN/trunk" "file:///Users/Konstantin/Documents/OPILab2/SVN/second" -m "create second branch" --username=kosty
svn switch "file:///Users/Konstantin/Documents/OPILab2/SVN/second"

cp $(find ../commit2) .
svn add * --force
svn commit --username="kosty" -m "r2"
svn up

svn checkout "file:///Users/Konstantin/Documents/OPILab2/SVN/trunk"
cp $(find ../commit3) .
svn add * --force
svn commit --username="kosty" -m "r3"
svn up

svn checkout "file:///Users/Konstantin/Documents/OPILab2/SVN/second"

cp $(find ../commit4) .
svn add * --force
svn commit --username="kosty" -m "r4"
svn up

svn checkout "file:///Users/Konstantin/Documents/OPILab2/SVN/trunk"
cp $(find ../commit5) .
svn add * --force
svn commit --username="kosty" -m "r5"
svn up

svn copy --parents "file:///Users/Konstantin/Documents/OPILab2/SVN/trunk" "file:///Users/Konstantin/Documents/OPILab2/SVN/third" -m "create third branch" --username=kosty
svn switch "file:///Users/Konstantin/Documents/OPILab2/SVN/third"

cp $(find ../commit6) .
svn add * --force
svn commit --username="kosty" -m "r6"
svn up

cp $(find ../commit7) .
svn add * --force
svn commit --username="kosty" -m "r7"
svn up

svn switch "file:///Users/Konstantin/Documents/OPILab2/SVN/trunk"
cp $(find ../commit8) .
svn add * --force
svn commit --username="kosty" -m "r8"
svn up

svn switch "file:///Users/Konstantin/Documents/OPILab2/SVN/third"
cp $(find ../commit9) .
svn add * --force
svn commit --username="kosty" -m "r9"
svn up

cp $(find ../commit10) .
svn add * --force
svn commit --username="kosty" -m "r10"
svn up

svn switch "file:///Users/Konstantin/Documents/OPILab2/SVN/second"

cp $(find ../commit11) .
svn add * --force
svn commit --username="kosty" -m "r11"
svn up

svn switch "file:///Users/Konstantin/Documents/OPILab2/SVN/third"
cp $(find ../commit12) .
svn add * --force
svn commit --username="kosty" -m "r12"
svn up

svn switch "file:///Users/Konstantin/Documents/OPILab2/SVN/second"

svn merge "file:///Users/Konstantin/Documents/OPILab2/SVN/third"

vim A.java
vim H.java
vim *

cp $(find ../commit13) .
svn add * --force
svn commit --username="kosty" -m "r13"
svn up

svn switch "file:///Users/Konstantin/Documents/OPILab2/SVN/trunk"
svn merge "file:///Users/Konstantin/Documents/OPILab2/SVN/second"
cp $(find ../commit14) .
svn add * --force
svn commit --username="kosty" -m "r14"
svn up