diff --git a/UE701/SEMESTRE_1_2023-24/EXERCICES/log.txt b/UE701/SEMESTRE_1_2023-24/EXERCICES/log.txt new file mode 100644 index 0000000000000000000000000000000000000000..82d39d1c6b4d8bb8a0abb2feb9c66c8734807bf0 --- /dev/null +++ b/UE701/SEMESTRE_1_2023-24/EXERCICES/log.txt @@ -0,0 +1,455 @@ +~ >git config --global credential.helper "cache --timeout=7200" + +~ >alias + +~ >dev1 +DEV1@paris >ls +projet +DEV1@paris >cd projet/ +projet >ls +changelog.txt README.md +projet >git branch +* main +projet >git branch -a +* main + remotes/origin/DEV + remotes/origin/HEAD -> origin/main + remotes/origin/TEST + remotes/origin/main +** +projet >git checkout DEV +Branch 'DEV' set up to track remote branch 'DEV' from 'origin'. +Switched to a new branch 'DEV' +projet >git branch +* DEV + main +projet >git branch -a +* DEV + main + remotes/origin/DEV + remotes/origin/HEAD -> origin/main + remotes/origin/TEST + remotes/origin/main +projet >git pull +From https://gitlab.univ-lorraine.fr/filippon1/projet + * [new branch] DEV1 -> origin/DEV1 + * [new branch] DEV2 -> origin/DEV2 +Already up to date. +projet >git branch -a +* DEV + main + remotes/origin/DEV + remotes/origin/DEV1 + remotes/origin/DEV2 + remotes/origin/HEAD -> origin/main + remotes/origin/TEST + remotes/origin/main +projet >pwd +/home/gecko/TP_GIT/DEV1@paris/projet +projet >git checkout DEV1 +Branch 'DEV1' set up to track remote branch 'DEV1' from 'origin'. +Switched to a new branch 'DEV1' +projet >git branch + DEV +* DEV1 + main +projet >cdb +TP_GIT >dev1 +DEV1@paris >dev2 +DEV2@nancy >ll +total 8 +drwxrwxr-x 2 gecko gecko 4096 oct. 5 03:28 ./ +drwxrwxr-x 7 gecko gecko 4096 oct. 5 03:28 ../ +DEV2@nancy >git clone https://gitlab.univ-lorraine.fr/filippon1/projet.git +Cloning into 'projet'... +remote: Enumerating objects: 6, done. +remote: Counting objects: 100% (6/6), done. +remote: Compressing objects: 100% (4/4), done. +remote: Total 6 (delta 0), reused 0 (delta 0), pack-reused 0 +Receiving objects: 100% (6/6), done. +DEV2@nancy >cd projet/ +projet >git branch +* main +projet >git checkout DEV2 +Branch 'DEV2' set up to track remote branch 'DEV2' from 'origin'. +Switched to a new branch 'DEV2' +projet >git branch +* DEV2 + main +projet >dev1 +DEV1@paris >cd projet/ +projet >git branch + DEV +* DEV1 + main +projet >dev2 +DEV2@nancy >cd projet/ +projet >git branch +* DEV2 + main + + +projet >cdb +TP_GIT >ls +DEV1@paris DEV2@nancy DEV@metz FONCTION1 TEST@strasbourg + + +TP_GIT >dev +DEV@metz >git clone https://gitlab.univ-lorraine.fr/filippon1/projet.git +Cloning into 'projet'... +remote: Enumerating objects: 6, done. +remote: Counting objects: 100% (6/6), done. +remote: Compressing objects: 100% (4/4), done. +remote: Total 6 (delta 0), reused 0 (delta 0), pack-reused 0 +Receiving objects: 100% (6/6), done. +DEV@metz >cd projet/ +projet >git branch -a +* main + remotes/origin/DEV + remotes/origin/DEV1 + remotes/origin/DEV2 + remotes/origin/HEAD -> origin/main + remotes/origin/TEST + remotes/origin/main +projet >git checkout DEV +Branch 'DEV' set up to track remote branch 'DEV' from 'origin'. +Switched to a new branch 'DEV' +projet >git branch +* DEV + main +projet >xterm& +[1] 42933 + +projet >dev1 +DEV1@paris >cd projet/ +projet >cp ~/TP_GIT/FONCTION1/sf1a.c . +projet >gcc -o sf1a.o -c sf1a.c +projet >gcc -o sf1a sf1a.o +projet >./sf1a +This program is running on CPU core 0 and NUMA node 0. + +projet >git add sf1a* +projet >git commit -m "ajout de sf1a" +[DEV1 cc140e8] ajout de sf1a + 3 files changed, 20 insertions(+) + create mode 100755 sf1a + create mode 100644 sf1a.c + create mode 100644 sf1a.o +projet >git push -u +Enumerating objects: 6, done. +Counting objects: 100% (6/6), done. +Delta compression using up to 4 threads +Compressing objects: 100% (5/5), done. +Writing objects: 100% (5/5), 3.59 KiB | 3.59 MiB/s, done. +Total 5 (delta 0), reused 0 (delta 0), pack-reused 0 +remote: +remote: To create a merge request for DEV1, visit: +remote: https://gitlab.univ-lorraine.fr/filippon1/projet/-/merge_requests/new?merge_request%5Bsource_branch%5D=DEV1 +remote: +To https://gitlab.univ-lorraine.fr/filippon1/projet.git + dc591f7..cc140e8 DEV1 -> DEV1 +Branch 'DEV1' set up to track remote branch 'DEV1' from 'origin'. + + + +projet >dev2 +DEV2@nancy >cd projet/ +projet >cp ~/TP_GIT/FONCTION1/sf1b.c . +projet >git branch +* DEV2 + main +projet >gcc -o sf1b.o -c sf1b.c +projet >gcc -o sf1b sf1b.o +projet >./sf1b +Today is Thu Oct 5 04:23:22 2023 +Time is 04:23:22 am +Date is: 05/10/2023 +projet >git add sf1b* +projet >git commit -m "ajout de sf1b" +[DEV2 25bf076] ajout de sf1b + 3 files changed, 47 insertions(+) + create mode 100755 sf1b + create mode 100644 sf1b.c + create mode 100644 sf1b.o +projet >git push -u +Enumerating objects: 6, done. +Counting objects: 100% (6/6), done. +Delta compression using up to 4 threads +Compressing objects: 100% (5/5), done. +Writing objects: 100% (5/5), 4.21 KiB | 4.21 MiB/s, done. +Total 5 (delta 0), reused 0 (delta 0), pack-reused 0 +remote: +remote: To create a merge request for DEV2, visit: +remote: https://gitlab.univ-lorraine.fr/filippon1/projet/-/merge_requests/new?merge_request%5Bsource_branch%5D=DEV2 +remote: +To https://gitlab.univ-lorraine.fr/filippon1/projet.git + dc591f7..25bf076 DEV2 -> DEV2 +Branch 'DEV2' set up to track remote branch 'DEV2' from 'origin'. + + + +projet >dev +DEV@metz >cd projet/ +projet >git branch +* DEV + main +projet >ls +changelog.txt README.md +projet >git branch -a +* DEV + main + remotes/origin/DEV + remotes/origin/DEV1 + remotes/origin/DEV2 + remotes/origin/HEAD -> origin/main + remotes/origin/TEST + remotes/origin/main + +projet >git remote add origin https://gitlab.univ-lorraine.fr/filippon1/projet.git + + +projet >git branch +* DEV + main +projet >git branch -a +* DEV + main + remotes/origin/DEV + remotes/origin/DEV1 + remotes/origin/DEV2 + remotes/origin/HEAD -> origin/main + remotes/origin/TEST + remotes/origin/main + +projet >git pull +remote: Enumerating objects: 11, done. +remote: Counting objects: 100% (11/11), done. +remote: Compressing objects: 100% (10/10), done. +remote: Total 10 (delta 3), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (10/10), 6.29 KiB | 1.57 MiB/s, done. +From https://gitlab.univ-lorraine.fr/filippon1/projet + dc591f7..cc140e8 DEV1 -> origin/DEV1 + dc591f7..25bf076 DEV2 -> origin/DEV2 +Already up to date. +projet >ls +changelog.txt README.md +projet >pwd +/home/gecko/TP_GIT/DEV@metz/projet +projet >git merge origin/DEV1 +Updating dc591f7..cc140e8 +Fast-forward + sf1a | Bin 0 -> 16056 bytes + sf1a.c | 20 ++++++++++++++++++++ + sf1a.o | Bin 0 -> 1752 bytes + 3 files changed, 20 insertions(+) + create mode 100755 sf1a + create mode 100644 sf1a.c + create mode 100644 sf1a.o +projet >ls +changelog.txt README.md sf1a sf1a.c sf1a.o +projet >git merge origin/DEV2 +Merge made by the 'ort' strategy. + sf1b | Bin 0 -> 16128 bytes + sf1b.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + sf1b.o | Bin 0 -> 2200 bytes + 3 files changed, 47 insertions(+) + create mode 100755 sf1b + create mode 100644 sf1b.c + create mode 100644 sf1b.o +projet >gedit sf1a.c sf1b.c & +[1] 56538 +projet >gcc -o sf1.o -c sf1.c +[1]+ Done gedit sf1a.c sf1b.c +projet >gcc -o sf1 sf1.o +projet >./sf1 +Today is Thu Oct 5 04:37:52 2023 +Time is 04:37:52 am +Date is: 05/10/2023 +This program is running on CPU core 1 and NUMA node 0. + +projet >rm sf1 +projet >rm sf1.o +projet >ls +changelog.txt README.md sf1a sf1a.c sf1a.o sf1b sf1b.c sf1b.o sf1.c +projet >gcc -o sf1.o -c sf1.c -march=native +projet >rm sf1.o +projet >gcc -o sf1-build.o -c sf1.c -march=native +projet >gcc -o sf1-build sf1-build.o +projet >./sf1-build +Today is Thu Oct 5 04:40:20 2023 +Time is 04:40:20 am +Date is: 05/10/2023 +This program is running on CPU core 1 and NUMA node 0. + +projet >git add sf1-build +projet >git push -u +Enumerating objects: 4, done. +Counting objects: 100% (4/4), done. +Delta compression using up to 4 threads +Compressing objects: 100% (2/2), done. +Writing objects: 100% (2/2), 368 bytes | 368.00 KiB/s, done. +Total 2 (delta 1), reused 0 (delta 0), pack-reused 0 +remote: +remote: To create a merge request for DEV, visit: +remote: https://gitlab.univ-lorraine.fr/filippon1/projet/-/merge_requests/new?merge_request%5Bsource_branch%5D=DEV +remote: +To https://gitlab.univ-lorraine.fr/filippon1/projet.git + dc591f7..87f58ee DEV -> DEV +Branch 'DEV' set up to track remote branch 'DEV' from 'origin'. +projet >git commit -m "ajout de sf1-build" +[DEV 198cd28] ajout de sf1-build + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100755 sf1-build +////////////////////////////////////////////////////////////////////////////// +projet >git push -u +To https://gitlab.univ-lorraine.fr/filippon1/projet.git + ! [rejected] DEV -> DEV (fetch first) +error: failed to push some refs to 'https://gitlab.univ-lorraine.fr/filippon1/projet.git' +hint: Updates were rejected because the remote contains work that you do +hint: not have locally. This is usually caused by another repository pushing +hint: to the same ref. You may want to first integrate the remote changes +hint: (e.g., 'git pull ...') before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. +projet >git pull +remote: Enumerating objects: 10, done. +remote: Counting objects: 100% (9/9), done. +remote: Compressing objects: 100% (8/8), done. +remote: Total 10 (delta 3), reused 1 (delta 1), pack-reused 1 +Unpacking objects: 100% (10/10), 1.23 KiB | 630.00 KiB/s, done. +From https://gitlab.univ-lorraine.fr/filippon1/projet + 87f58ee..f376f57 DEV -> origin/DEV +hint: You have divergent branches and need to specify how to reconcile them. +hint: You can do so by running one of the following commands sometime before +hint: your next pull: +hint: +hint: git config pull.rebase false # merge (the default strategy) +hint: git config pull.rebase true # rebase +hint: git config pull.ff only # fast-forward only +hint: +hint: You can replace "git config" with "git config --global" to set a default +hint: preference for all repositories. You can also pass --rebase, --no-rebase, +hint: or --ff-only on the command line to override the configured default per +hint: invocation. +fatal: Need to specify how to reconcile divergent branches. +projet >ls +changelog.txt README.md sf1a sf1a.c sf1a.o sf1b sf1b.c sf1b.o sf1-build sf1-build.o sf1.c +projet >git pull +hint: You have divergent branches and need to specify how to reconcile them. +hint: You can do so by running one of the following commands sometime before +hint: your next pull: +hint: +hint: git config pull.rebase false # merge (the default strategy) +hint: git config pull.rebase true # rebase +hint: git config pull.ff only # fast-forward only +hint: +hint: You can replace "git config" with "git config --global" to set a default +hint: preference for all repositories. You can also pass --rebase, --no-rebase, +hint: or --ff-only on the command line to override the configured default per +hint: invocation. +fatal: Need to specify how to reconcile divergent branches. +projet >git config pull.rebase false +////////////////////////////////////////////////////////////////////////////// +projet >git pull +Merge made by the 'ort' strategy. + sf1a | Bin 16056 -> 0 bytes + sf1a.c | 20 -------------------- + sf1a.o | Bin 1752 -> 0 bytes + sf1b | Bin 16128 -> 0 bytes + sf1b.c | 47 ----------------------------------------------- + sf1b.o | Bin 2200 -> 0 bytes + 6 files changed, 67 deletions(-) + delete mode 100755 sf1a + delete mode 100644 sf1a.c + delete mode 100644 sf1a.o + delete mode 100755 sf1b + delete mode 100644 sf1b.c + delete mode 100644 sf1b.o +projet >git pull +Already up to date. +projet >git commit -m "ajout de sf1-build" +On branch DEV +Your branch is ahead of 'origin/DEV' by 2 commits. + (use "git push" to publish your local commits) + +Untracked files: + (use "git add <file>..." to include in what will be committed) + sf1-build.o + sf1.c + +nothing added to commit but untracked files present (use "git add" to track) +projet >git pull +Already up to date. +projet >git push -u +Enumerating objects: 7, done. +Counting objects: 100% (7/7), done. +Delta compression using up to 4 threads +Compressing objects: 100% (5/5), done. +Writing objects: 100% (5/5), 3.10 KiB | 3.10 MiB/s, done. +Total 5 (delta 2), reused 0 (delta 0), pack-reused 0 +remote: +remote: View merge request for DEV: +remote: https://gitlab.univ-lorraine.fr/filippon1/projet/-/merge_requests/2 +remote: +To https://gitlab.univ-lorraine.fr/filippon1/projet.git + f376f57..fb86245 DEV -> DEV +Branch 'DEV' set up to track remote branch 'DEV' from 'origin'. + + + +projet >test +TEST@strasbourg >ls +TEST@strasbourg >git clone https://gitlab.univ-lorraine.fr/filippon1/projet.git +Cloning into 'projet'... +remote: Enumerating objects: 33, done. +remote: Counting objects: 100% (13/13), done. +remote: Compressing objects: 100% (13/13), done. +remote: Total 33 (delta 4), reused 0 (delta 0), pack-reused 20 +Receiving objects: 100% (33/33), 13.75 KiB | 4.58 MiB/s, done. +Resolving deltas: 100% (11/11), done. +TEST@strasbourg >cd projet/ +projet >ls +changelog.txt README.md +projet >git branch +* main +projet >git TEST +git: 'TEST' is not a git command. See 'git --help'. +projet >git branch -a +* main + remotes/origin/DEV + remotes/origin/DEV1 + remotes/origin/DEV2 + remotes/origin/HEAD -> origin/main + remotes/origin/TEST + remotes/origin/main +projet >git checkout TEST +Branch 'TEST' set up to track remote branch 'TEST' from 'origin'. +Switched to a new branch 'TEST' +projet >ls +changelog.txt README.md +projet >git pull +Already up to date. +projet >git branch -a +* TEST + main + remotes/origin/DEV + remotes/origin/DEV1 + remotes/origin/DEV2 + remotes/origin/HEAD -> origin/main + remotes/origin/TEST + remotes/origin/main +projet >git merge origin/DEV +Updating dc591f7..fb86245 +Fast-forward + sf1-build | Bin 0 -> 16168 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100755 sf1-build +projet >git branch +* TEST + main +projet >ls +changelog.txt README.md sf1-build +projet >./sf1-build +Today is Thu Oct 5 04:51:34 2023 +Time is 04:51:34 am +Date is: 05/10/2023 +This program is running on CPU core 0 and NUMA node 0.