From 2c8c48f77c69da398bab3dcee0ceb0ca62f7078e Mon Sep 17 00:00:00 2001 From: "Alice (LiTH)" Date: Mon, 27 Mar 2023 13:52:20 +0300 Subject: [PATCH] build: report send to server --- Jnxtn.txt | 455 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 455 insertions(+) create mode 100644 Jnxtn.txt diff --git a/Jnxtn.txt b/Jnxtn.txt new file mode 100644 index 0000000..ba89696 --- /dev/null +++ b/Jnxtn.txt @@ -0,0 +1,455 @@ +отчет Ли Тэ Хо А-02-22 + ++++++ + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project +$ cd .. + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice +$ cd .. + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02 +$ cd alice + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice +$ cd project + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project +$ + +++++++ + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git config user.name 'Alice (LiTH)' + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git config user.mail 'LiTek@mpei.ru' + +++++++ + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git status +On branch main + +No commits yet + +Untracked files: + (use "git add ..." to include in what will be committed) + bin/ + main.cpp + obj/ + project.cbp + +nothing added to commit but untracked files present (use "git add" to track) + ++++++++++ + +отслеживается файл мейн +$ git status +On branch main + +No commits yet + +Changes to be committed: + (use "git rm --cached ..." to unstage) + new file: main.cpp + +Untracked files: + (use "git add ..." to include in what will be committed) + bin/ + obj/ + project.cbp + ++++++++++ + +появилась надпись модифайд +$ git status +On branch main +Changes not staged for commit: + (use "git add ..." to update what will be committed) + (use "git restore ..." to discard changes in working directory) + modified: main.cpp + +Untracked files: + (use "git add ..." to include in what will be committed) + bin/ + obj/ + +no changes added to commit (use "git add" and/or "git commit -a") + ++++++++++ +добавили разность и таким же способом сумму +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git commit -a -m "code: add differ" +[main 067c23b] code: add differ + 1 file changed, 3 insertions(+), 1 deletion(-) + ++++++++++ +коммит про гитигнор +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git add .gitignore + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git commit -m "git: cant see files" +[main c8e5d39] git: cant see files + 1 file changed, 2 insertions(+) + create mode 100644 .gitignore + +++++++++++ + +показано время дата и кем были проведены изменения в файлах проекта +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log --stat +commit c8e5d39479c3260b7de4a2a6ce81e16fa7b78e49 (HEAD -> main) +Author: Alice (LiTH) +Date: Sun Mar 26 23:43:59 2023 +0300 + + git: cant see files + + .gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit 067c23b0868de2fb2076ff8aa28d420134e87e5e +Author: Alice (LiTH) +Date: Sun Mar 26 23:33:49 2023 +0300 + + code: add differ + + main.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 2305a3ac6621cba4903b9697921dea7b97e6e317 +Author: Alice (LiTH) +Date: Sun Mar 26 23:27:58 2023 +0300 + + code: addition + + main.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 54838f20b7ad86093b93cd4e46f95724e85fbcf9 +Author: Alice (LiTH) +Date: Sun Mar 26 23:18:32 2023 +0300 + + build: add project file + + project.cbp | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +commit 680c44a1bd9b79ee54eaa4f2e86ee10bdb0dfff5 +Author: Alice (LiTH) +Date: Sun Mar 26 23:16:36 2023 +0300 + + code: заготовка программы + + main.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + ++++++++++++ +найдены коммиты по темам +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log --grep "build:" +commit 54838f20b7ad86093b93cd4e46f95724e85fbcf9 +Author: Alice (LiTH) +Date: Sun Mar 26 23:18:32 2023 +0300 + + build: add project file + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log project.cbp +commit 54838f20b7ad86093b93cd4e46f95724e85fbcf9 +Author: Alice (LiTH) +Date: Sun Mar 26 23:18:32 2023 +0300 + + build: add project file + +++++++++++ + +показать первый коммит +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git show main~4 +commit 680c44a1bd9b79ee54eaa4f2e86ee10bdb0dfff5 +Author: Alice (LiTH) +Date: Sun Mar 26 23:16:36 2023 +0300 + + code: заготовка программы + +diff --git a/main.cpp b/main.cpp +new file mode 100644 +index 0000000..b4392ec +--- /dev/null ++++ b/main.cpp +@@ -0,0 +1,9 @@ ++#include ++ ++using namespace std; ++ ++int main() ++{ ++ cout << "Hello world!" << endl; ++ return 0; ++} + ++++++++++++ + +отображены все добавления и исключения + +$ git diff +diff --git a/main.cpp b/main.cpp +index 45aaf8b..832e890 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -8,7 +8,8 @@ int main() + int a, b; + cin >> a >> b; + cout << "A + B = " << a + b << '\n' +- << "A - B = " << a - b << '\n'; ++ << "A - B = " << a - b << '\n' ++ << "A * B = " << a * b << '\n'; + + return 0; + } + +++++++++++++ + +passprhase: 1234 + +++++++++++++ + +подключился..... +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ ssh-keygen +Generating public/private rsa key pair. +Enter file in which to save the key (/c/Users/Dell_Latitude_E7440/.ssh/id_rsa): +/c/Users/Dell_Latitude_E7440/.ssh/id_rsa already exists. +Overwrite (y/n)? y +Enter passphrase (empty for no passphrase): +Enter same passphrase again: +Your identification has been saved in /c/Users/Dell_Latitude_E7440/.ssh/id_rsa +Your public key has been saved in /c/Users/Dell_Latitude_E7440/.ssh/id_rsa.pub +The key fingerprint is: +SHA256:RFr9Qo/YmTGWK2Git+9BJAA3pZiGAOsdEslt8OoZCN0 Dell_Latitude_E7440@DESKTOP-6H5QGL1 +The key's randomart image is: ++---[RSA 3072]----+ +|=o=.+.. o. . | +|.*oB +.+o B | +|+.*oE.ooo* X | +|+.+ o .+o B o | +|.+ . . .S. . | +|. o .. | +| o .. | +| .. | +| .. | ++----[SHA256]-----+ + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ eval $(ssh-agent -s) +Agent pid 2027 + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ ssh-add +Enter passphrase for /c/Users/Dell_Latitude_E7440/.ssh/id_rsa: +Identity added: /c/Users/Dell_Latitude_E7440/.ssh/id_rsa (Dell_Latitude_E7440@DESKTOP-6H5QGL1) + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ cat ~/.ssh/id_rsa.pub +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC9ooSQ4JLlpJwZMU4Hmnj6b0d4RMThQ9lSJRHu2XXpxesR/wDqjPbgOeF+GXhXUJDHO87ES5bqpwDp2Ibj0GQnt8baqSoIqY77qQjq2f+3AmHBTtE2oeTXJ0LXjD/lF4FzzHhBOPgY8wht/zf03408moL090+9idaZjXeFR3NigqsngwY0AUpETtJdfQIx+buHHHZfHw/Hp5iH3ILnftM6HDgrb4GTQn3UMtpYCB8yIrB1rZsMGRQQ/XASY786Acc69FaE+PGzAmbjZ5f6lpKZz3FAJpLzLAl7zrpqG1aEx91IoP1MH1Zm3eh8m8/TIJvkr6PvIxcozjoAVdVvscfKiaDrOgdH7TsQo1BYKStckgTctXbSmr5gi2NPK0uuN7+L+9xmcvQp0kLh3Y4YynEn2Kht57eyhVCJVgpA2vo5bhTBXdv6oapjod0WgrH4n9zwAeqJczpL/16vtSsMsrQB3h+Hzn11CclBBn4IM5GUtl+FgGJ/aPwZt3ejvH+8Wek= Dell_Latitude_E7440@DESKTOP-6H5QGL1 + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git remote add origin git@uit.mpei.ru:LiTek/cs-lab02.git + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git push -u origin main +Enumerating objects: 15, done. +Counting objects: 100% (15/15), done. +Delta compression using up to 4 threads +Compressing objects: 100% (13/13), done. +Writing objects: 100% (15/15), 1.90 KiB | 487.00 KiB/s, done. +Total 15 (delta 1), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:LiTek/cs-lab02.git + * [new branch] main -> main +branch 'main' set up to track 'origin/main'. + +++++++++++++ + +на бобе +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/bob/project (main) +$ git commit -a -m "code: added multiply" +[main a4aaf54] code: added multiply + 1 file changed, 2 insertions(+), 1 deletion(-) + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/bob/project (main) +$ git push +Enter passphrase for key '/c/Users/Dell_Latitude_E7440/.ssh/id_rsa': +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 4 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 370 bytes | 370.00 KiB/s, done. +Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:LiTek/cs-lab02.git + c8e5d39..a4aaf54 main -> main + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/bob/project (main) +$ git fetch +Enter passphrase for key '/c/Users/Dell_Latitude_E7440/.ssh/id_rsa': +remote: Enumerating objects: 5, done. +remote: Counting objects: 100% (5/5), done. +remote: Compressing objects: 100% (3/3), done. +remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (3/3), 351 bytes | 14.00 KiB/s, done. +From uit.mpei.ru:LiTek/cs-lab02 + a4aaf54..44873ca main -> origin/main + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/bob/project (main) +$ git pull --ff-only +Enter passphrase for key '/c/Users/Dell_Latitude_E7440/.ssh/id_rsa': +Updating a4aaf54..44873ca +Fast-forward + main.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +++++++++++ + +на алисе +$ git fetch +remote: Enumerating objects: 5, done. +remote: Counting objects: 100% (5/5), done. +remote: Compressing objects: 100% (3/3), done. +remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (3/3), 350 bytes | 14.00 KiB/s, done. +From uit.mpei.ru:LiTek/cs-lab02 + c8e5d39..a4aaf54 main -> origin/main + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* a4aaf54 (origin/main) code: added multiply +* c8e5d39 (HEAD -> main) git: cant see files +* 067c23b code: add differ +* 2305a3a code: addition +* 54838f2 build: add project file +* 680c44a code: заготовка программы + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git pull --ff-only +Updating c8e5d39..a4aaf54 +Fast-forward + main.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git commit -a -m "code: added dividing" +[main 44873ca] code: added dividing + 1 file changed, 2 insertions(+), 1 deletion(-) + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git push +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 4 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 371 bytes | 371.00 KiB/s, done. +Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:LiTek/cs-lab02.git + a4aaf54..44873ca main -> main + +++++++++++++++++ + +у боба проблемы +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/bob/project (main) +$ git log --oneline --decorate --all --graph +* 9fbafa2 (HEAD -> main) code: added min +| * bf7cc07 (origin/main, origin/HEAD) code: added max +|/ +* 44873ca code: added dividing +* a4aaf54 code: added multiply +* c8e5d39 git: cant see files +* 067c23b code: add differ +* 2305a3a code: addition +* 54838f2 build: add project file +* 680c44a code: заготовка программы + ++++++++++++=+++ + +показаногде почему и зачем +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/bob/project (main) +$ git rebase origin/main +Auto-merging main.cpp +CONFLICT (content): Merge conflict in main.cpp +error: could not apply 9fbafa2... code: added min +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm ", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 9fbafa2... code: added min + +++++++++++++++++++++ + +исправили в версии боба и все получилось +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/bob/project (main|REBASE 1/1) +$ git add main.cpp + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/bob/project (main|REBASE 1/1) +$ git rebase --continue +Successfully rebased and updated refs/heads/main. + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/bob/project (main) +$ git log --oneline --decorate --all --graph +* 29eb468 (HEAD -> main) code: added min +* 5e0e7d5 code: added min +* bf7cc07 (origin/main, origin/HEAD) code: added max +* 44873ca code: added dividing +* a4aaf54 code: added multiply +* c8e5d39 git: cant see files +* 067c23b code: add differ +* 2305a3a code: addition +* 54838f2 build: add project file +* 680c44a code: заготовка программы + + ++++++++++++++++=+++ + + +синхронизировал мейн с сервером и слил дабл и мейн +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git pull --ff-only +remote: Enumerating objects: 8, done. +remote: Counting objects: 100% (8/8), done. +remote: Compressing objects: 100% (6/6), done. +remote: Total 6 (delta 2), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (6/6), 742 bytes | 14.00 KiB/s, done. +From uit.mpei.ru:LiTek/cs-lab02 + bf7cc07..29eb468 main -> origin/main +Updating bf7cc07..29eb468 +Fast-forward + main.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* 72a2183 (double) code: changed int to double +| * 29eb468 (HEAD -> main, origin/main) code: added min +| * 5e0e7d5 code: added min +|/ +* bf7cc07 code: added max +* 44873ca code: added dividing +* a4aaf54 code: added multiply +* c8e5d39 git: cant see files +* 067c23b code: add differ +* 2305a3a code: addition +* 54838f2 build: add project file +* 680c44a code: заготовка программы + +Dell_Latitude_E7440@DESKTOP-6H5QGL1 MINGW64 ~/Desktop/lab02/alice/project (main) +$ git merge double +Auto-merging main.cpp +Merge made by the 'ort' strategy. + main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +