Nove funkcije #19431
Zatvoren
fmk/scripts je ipak repos za sebe, howto fmk git manipulacija, fmk/scripts
Dodano od Ernad Husremović prije skoro 15 godina. Izmjenjeno prije više od 14 godina.
0%
Povezani tiketi 2 (0 otvoreno — 2 zatvorenih)
Izmjenjeno od Ernad Husremović prije skoro 15 godina
background¶
... ovdje prvi put pominjem ove utility skripte
kako sam uveo fmk repos, subrepos-ima (fmk_lib, fmk_common, fin ...) uočio sam da imam puno prekucavanja pa sam počeo da pravim utility skripte kojma se radi checkout svih subrepos-a, pa commit itd itd ...
te skripte sam commit-ovao u fmk repos-e http://gitorious.bring.out.ba/fmk/fmk/ ali kako imam za svaki build poseban branch (clipper, harbour, clipper-vsasa, harbour-hernad) počeo sam da se "gubim".
Naime, kod svake nove operacije uočim da ta i ta skripta u toj situaciji ne valja pa je updatujem u tom branch-u.
Pa onda krenem u drugi branch i krenem sa običnim copy da to mergiram.
Automatsko mergiranje je u startu otaplo jer su pojedini branchovi (npr fmk branch=clipper i fmk branch=harbour) uveliko kruške i jabuke.
I onda sam skontao da to update-ovanje hem što traje hem što pravim greške.
fmk / scripts je poseban projekat¶
Rezultat toga je da sam na kraju sve te skripte u fmk repos-u izbrisao osim set_env.sh gdje setujem varijable koje su specifične za pojedini branch, a koje utility skripte koriste
Izmjenjeno od Ernad Husremović prije skoro 15 godina
anti-guruizacija - rad developera git-om¶
i na kraju sam dobio tri fakat prava programa a ne tamo neke "skriptice". međutim, ono što je bitno jeste da će to stvarno uštediti puno vremena developer-u i vrijedi sada posvetiti vremena da se to stavi u funkciju umjesto da svaki developer uči da bude git-guru
Izmjenjeno od Ernad Husremović prije skoro 15 godina
kako sve to na kraju funkcioniše ...¶
uzeću za primjer održavanje main clipper repos-a
checkout fmk¶
devel$ git clone git@gitorious.bring.out.ba:fmk/fmk.git
checkout fmk/scripts¶
u ovom primjeru ću biti developer-user pa ću uzeti read-only verziju skripti
devel/fmk$ git clone git://gitorious.bring.out.ba/fmk/scripts.git
i to je za početak to
fmk - clipper branch¶
pravim lokalni clipper-branch
bringout@bringout-developer-amd64:~/devel/fmk$ git checkout -b clipper origin/clipper
.. Switched to branch 'clipper'
u njemu sam već podesio set_envars.sh
bringout@bringout-developer-amd64:~/devel/fmk$ cat set_envars.sh
echo $0
BRANCH=clipper <<<<<<<<<<<<<<<<<<<<< lokalni branch
REMOTE_REPOS=origin <<<<<<<<<<<<<<<< origin je uvijek glavni fmk repos
REMOTE_BRANCH=clipper <<<<<<<<<<<<<< remote branch
PROJECTS="fmk_lib fmk_common fin kalk fakt os ld virm kam epdv" <<<<<<< sub-projekti kojima manipulišem
echo setujem BRANCH=$BRANCH, REMOTE_REPOS=$REMOTE_REPOS, REMOTE_BRANCH=$BRANCH
echo PROJECTS=$PROJECTS
usage()
{
echo $0 commit_poruka
}
Izmjenjeno od Ernad Husremović prije skoro 15 godina
imamo li sub repos-e ? git submodules¶
sljeceći korak je dodavanje git submodula (git submodule add git_repos_url project_name ) ako nisu dodani
bringout@bringout-developer-amd64:~/devel/fmk$ git submodule
-99c257992e2e8f5f16b8fa780604984065080339 epdv -f7a86ff7a2ef0de6bec5c9b16a955bf7e1022e18 fakt a87a6c08348d6e557c95f6d8a9b29d102b2d0c3b fin (heads/clipper) +655b423b94dd9b37c53a2c973a4788540a484d5a fmk_common (heads/clipper-vsasa) +3879640fd9f4e26478018d2204ca7ce25bdd828a fmk_lib (heads/clipper-vsasa) -eb5144b4d93c67c53c2a9971d32994f551ebfb80 kalk -2f3f27fd2ede391a647a0b8d409bb10c2d8fef02 kam -999925e1b6baf48a02f39e7125022f6d28e91116 ld -ef07f77df5247d80c142c195c6c39b3c5c1f6a60 os -f7b1bffb24545c13a00dbbb44c0df292e336c44c virm
Izmjenjeno od Ernad Husremović prije skoro 15 godina
pozicionirajmo se na pravo mjesto scripts/checkout_repositories.sh¶
jedna od glavnih stvari gde sam se ja zapetljavao jeste to što se switcham između pojedinih branch-ova u fmk repos-u a ne pozicioniram submodule na prave lokacije
pa mi onda fmk clipper zapamti poziciju koja je ustvari na harbour branch-u
"checkout_repositories.sh to rješava"
bringout@bringout-developer-amd64:~/devel/fmk$ scripts/checkout_repositories.sh scripts/checkout_repositories.sh
setujem BRANCH=clipper, REMOTE_REPOS=origin, REMOTE_BRANCH=clipper PROJECTS=fmk_lib fmk_common fin kalk fakt os ld virm kam epdv ================== scripts/checkout_repositories.sh : 2010-01-18-7 =================================== . ================ /home/bringout/devel/fmk/fmk_lib =================== git checkout -b clipper origin/clipper fatal: git checkout: branch clipper already exists checkout -f clipper Switched to branch 'clipper' ================ /home/bringout/devel/fmk/fmk_common =================== git checkout -b clipper origin/clipper fatal: git checkout: branch clipper already exists checkout -f clipper Switched to branch 'clipper' ================ /home/bringout/devel/fmk/fin =================== git checkout -b clipper origin/clipper fatal: git checkout: branch clipper already exists checkout -f clipper Switched to branch 'clipper' ================ /home/bringout/devel/fmk/kalk =================== git checkout -b clipper origin/clipper ..
Izmjenjeno od Ernad Husremović prije skoro 15 godina
kako izgleda jedan subrepos¶
nakon checkout-a imamo ovo stanje
bringout@bringout-developer-amd64:~/devel/fmk/fin$ git branch -l
* clipper clipper-vsasa harbour harbour-hernad master
ali tome je predhodilo dosta operacije podešavanja remote repozitorija i branch-ova (git remote add ..., git checkout -b xy origin/xy ...)
fin/.git/config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git@gitorious.bring.out.ba:fmk/fin.git
push = refs/heads/harbour:harbour
[remote "vsasa"]
url = git://gitorious.bring.out.ba/~vsasa/fmk/vsasa-fin.git
fetch = +refs/heads/*:refs/remotes/vsasa/*
[remote "hernad"]
url = git@gitorious.bring.out.ba:~hernad/fmk/hernads-fin.git
fetch = +refs/heads/*:refs/remotes/hernad/*
push = refs/heads/harbour-hernad:harbour
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "harbour"]
remote = origin
merge = refs/heads/harbour
[branch "clipper"]
remote = origin
merge = refs/heads/clipper
[branch "harbour-hernad"]
remote = hernad
merge = refs/heads/harbour
[branch "clipper-vsasa"]
remote = vsasa
merge = refs/heads/clipper
Izmjenjeno od Ernad Husremović prije skoro 15 godina
fetch and merge¶
ako je neko drugi radio na clipper branch-u main repos-a onda je prva stvar koju trebam mergiranje tih stvari u svoj lokalni repos
i to mi ova skripta radi.
vratimo se onome što je inače moj zadatak - mergiranje clipper branch-a
bringout@bringout-developer-amd64:~/devel/fmk$ scripts/fetch_merge_repositories.sh
====================================== scripts/fetch_merge_repositories.sh : 2010-01-18-8 ======================================= fetchiram remote repos, radim merge sa lokalnim . scripts/fetch_merge_repositories.sh setujem BRANCH=clipper, REMOTE_REPOS=origin, REMOTE_BRANCH=clipper PROJECTS=fmk_lib fmk_common fin kalk fakt os ld virm kam epdv ============== fmk_lib ======================= /home/bringout/devel/fmk/fmk_lib git fetch origin git checkout clipper Already on 'clipper' git merge origin/clipper Already up-to-date. ============== fmk_common ======================= /home/bringout/devel/fmk/fmk_common git fetch origin git checkout clipper Already on 'clipper' git merge origin/clipper Already up-to-date. ..
Izmjenjeno od Ernad Husremović prije skoro 15 godina
commit, pushiraj sve subrepos-e¶
bringout@bringout-developer-amd64:~/devel/fmk$ scripts/commit_push_all.sh "skripte su super"
scripts/commit_push_all.sh setujem BRANCH=clipper, REMOTE_REPOS=origin, REMOTE_BRANCH=clipper PROJECTS=fmk_lib fmk_common fin kalk fakt os ld virm kam epdv ================ scripts/commit_push_all.sh : 2010-01-18-8 ================================================== . =================== fmk_lib ================================ # On branch clipper # Untracked files: # (use "git add <file>..." to include in what will be committed) # # .hbmk/ # libfmk_lib.a # test.sh nothing added to commit but untracked files present (use "git add" to track) git push origin clipper Everything up-to-date =================== fmk_common ================================ # On branch clipper # Untracked files: # (use "git add <file>..." to include in what will be committed) # # .hbmk/ # libfmk_common.a nothing added to commit but untracked files present (use "git add" to track) git push origin clipper Everything up-to-date =================== fin ================================ # On branch clipper # Untracked files: # (use "git add <file>..." to include in what will be committed) # # .hbmk/ # FMK.INI # dir.rb nothing added to commit but untracked files present (use "git add" to track) git push origin clipper Everything up-to-date .. ========================= /home/bringout/devel/fmk ================================= na kraju, commitujem glavni repos # On branch clipper # Untracked files: # (use "git add <file>..." to include in what will be committed) # # scripts/ # srv.hbc # srv_fmk/ # tmp/ nothing added to commit but untracked files present (use "git add" to track) Everything up-to-date
Izmjenjeno od Ernad Husremović prije skoro 15 godina
u gornjem primjeru nije nikakvih promjena bilo ...
hajmo sada nešto promjeniti
Izmjenjeno od Ernad Husremović prije skoro 15 godina
fmk_common, rad na privatnom klonu¶
u fmk_common dodajem hernad remote repos:
bringout@bringout-developer-amd64:~/devel/fmk/fmk_common$ git remote add hernad git@gitorious.bring.out.ba:~hernad/fmk/hernads-fmk_common.git
pa setujem clipper-hernad lokalni branch
bringout@bringout-developer-amd64:~/devel/fmk/fmk_common$ git checkout -b clipper-hernad hernad/clipper
Branch clipper-hernad set up to track remote branch clipper from hernad. Switched to a new branch 'clipper-hernad'
uradio sam izmjene
bringout@bringout-developer-amd64:~/devel/fmk/fmk_common$ git commit -a
[clipper-hernad 4ed4947] sigma-com => bring.out 2 files changed, 2 insertions(+), 43 deletions(-)
i onda to pushiram na remote hernad repos, clipper branch
bringout@bringout-developer-amd64:~/devel/fmk/fmk_common$ git push hernad clipper-hernad:clipper
Counting objects: 11, done. Compressing objects: 100% (6/6), done. Writing objects: 100% (6/6), 565 bytes, done. Total 6 (delta 5), reused 0 (delta 0) => Syncing Gitorious... [OK] To git@gitorious.bring.out.ba:~hernad/fmk/hernads-fmk_common.git <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< to sam htio - ok 906deca..4ed4947 clipper-hernad -> clipper
Izmjenjeno od Ernad Husremović prije skoro 15 godina
mergiranje u main repos¶
bringout@bringout-developer-amd64:~/devel/fmk/fmk_common$ git checkout clipper
Switched to branch 'clipper' bringout@bringout-developer-amd64:~/devel/fmk/fmk_common$ git fetch hernad
bringout@bringout-developer-amd64:~/devel/fmk/fmk_common$ git merge hernad/clipper
Merge made by recursive. svi/gvars.prg | 43 +------------------------------------------ ugov/genug2.prg | 2 +- 2 files changed, 2 insertions(+), 43 deletions(-)
napomenuću da gore nakon mergiranja nisam uradio push u origin
Izmjenjeno od Ernad Husremović prije skoro 15 godina
bringout@bringout-developer-amd64:~/devel/fmk$ scripts/commit_push_all.sh "copyright promjene"
scripts/commit_push_all.sh
setujem BRANCH=clipper, REMOTE_REPOS=origin, REMOTE_BRANCH=clipper PROJECTS=fmk_lib fmk_common fin kalk fakt os ld virm kam epdv ================ scripts/commit_push_all.sh : 2010-01-18-8 ================================================== . =================== fmk_lib ================================ # On branch clipper # Untracked files: # (use "git add <file>..." to include in what will be committed) # # .hbmk/ # libfmk_lib.a # test.sh nothing added to commit but untracked files present (use "git add" to track) git push origin clipper Everything up-to-date =================== fmk_common ================================ # On branch clipper # Your branch is ahead of 'origin/clipper' by 2 commits. # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # .hbmk/ # libfmk_common.a nothing added to commit but untracked files present (use "git add" to track) git push origin clipper Counting objects: 14, done. Compressing objects: 100% (8/8), done. Writing objects: 100% (8/8), 843 bytes, done. Total 8 (delta 6), reused 0 (delta 0) => Syncing Gitorious... [OK] To git@gitorious.bring.out.ba:fmk/fmk_common.git 751bd58..47289e7 clipper -> clipper <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< urađen push =================== fin ================================ # On branch clipper # Untracked files: # (use "git add <file>..." to include in what will be committed) # # .hbmk/ # FMK.INI # dir.rb nothing added to commit but untracked files present (use "git add" to track) git push origin clipper Everything up-to-date =================== kalk ================================ # On branch clipper nothing to commit (working directory clean) git push origin clipper Everything up-to-date ... =================== epdv ================================ # On branch clipper nothing to commit (working directory clean) git push origin clipper Everything up-to-date ========================= /home/bringout/devel/fmk ================================= na kraju, commitujem glavni repos [clipper 2dea113] copyright promjene 1 files changed, 1 insertions(+), 1 deletions(-) Counting objects: 3, done. Compressing objects: 100% (2/2), done. Writing objects: 100% (2/2), 258 bytes, done. Total 2 (delta 1), reused 0 (delta 0) => Syncing Gitorious... [OK] To git@gitorious.bring.out.ba:fmk/fmk.git 685867a..2dea113 clipper -> clipper <<<<<<<<<<<<<<<<<<< naravno treba osvježiti stanje fmk_common submodula i to je ovim urađeno
Izmjenjeno od Ernad Husremović prije skoro 15 godina
- Naslov promijenjeno iz fmk/scripts je ipak repos za sebe u fmk/scripts je ipak repos za sebe, howto fmk/scripts
Izmjenjeno od Ernad Husremović prije skoro 15 godina
dodavanje novog submodula rnal submodule¶
bringout@bringout-developer-amd64:~/devel/fmk$ git submodule add git://gitorious.bring.out.ba/fmk/rnal.git rnal
Izmjenjeno od Ernad Husremović prije skoro 15 godina
- Naslov promijenjeno iz fmk/scripts je ipak repos za sebe, howto fmk/scripts u fmk/scripts je ipak repos za sebe, howto fmk git manipulacija, fmk/scripts
checkout lokalni branchovi¶
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git checkout -b harbour origin/harbour
Branch harbour set up to track remote branch harbour from origin. Switched to a new branch 'harbour'
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git checkout -b clipper origin/clipper
Branch clipper set up to track remote branch clipper from origin. Switched to a new branch 'clipper'
trebaće mi vsasa radi mergiranja njegovih promjena:
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git remote add vsasa git://gitorious.bring.out.ba/~vsasa/fmk/vsasha-rnal.git
ako ja budem radio nešto trebam to prvo raditi u svom privatnom repos-u
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git remote add hernad git@gitorious.bring.out.ba:~hernad/fmk/hernads-rnal.git
Izmjenjeno od Ernad Husremović prije skoro 15 godina
fetchiram sve iz remote repos-a
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git fetch vsasa
remote: Counting objects: 419, done. remote: Compressing objects: 100% (358/358), done. remote: Total 363 (delta 288), reused 0 (delta 0) Receiving objects: 100% (363/363), 76.96 KiB, done. Resolving deltas: 100% (288/288), completed with 47 local objects. From git://gitorious.bring.out.ba/~vsasa/fmk/vsasha-rnal * [new branch] clipper -> vsasa/clipper * [new branch] harbour -> vsasa/harbour * [new branch] master -> vsasa/master
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git fetch hernad
From git@gitorious.bring.out.ba:~hernad/fmk/hernads-rnal * [new branch] clipper -> hernad/clipper * [new branch] harbour -> hernad/harbour * [new branch] master -> hernad/master
Izmjenjeno od Ernad Husremović prije skoro 15 godina
mergiram od saše clipper branch¶
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git checkout clipper
Already on 'clipper'
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git merge vsasa/clipper
Updating e7d592e..7c9e3ff Fast forward cdx/rnal.ch | 4 +- chs/RNAL.CHS | 8 + db/db.prg | 62 ++-
Izmjenjeno od Ernad Husremović prije skoro 15 godina
na isti način harbour branch
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git checkout harbour
Switched to branch 'harbour'
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git merge vsasa/harbour
Updating a54ce67..cd4f211 Fast forward cdx/rnal.ch | 2 +- co_add_operation_attributes.prg | 17 ++- doc_add_operations.prg | 44 ++++- glass_specif.prg | 1 + menu_codes.prg | 7 + menu_reports.prg | 3 + ral.prg | 357 +++++++++++++++++++++++++++++++++++++++ rpt_ral.prg | 309 +++++++++++++++++++++++++++++++++ tdb_rnal.prg | 4 + utility.prg | 5 + 10 files changed, 740 insertions(+), 9 deletions(-) create mode 100644 ral.prg create mode 100644 rpt_ral.prg
Izmjenjeno od Ernad Husremović prije skoro 15 godina
moj privatni repos mergiranje¶
trebaće mi dva nova lokalna branch-a
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git checkout -b clipper-hernad hernad/clipper
Branch clipper-hernad set up to track remote branch clipper from hernad. Switched to a new branch 'clipper-hernad'
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git checkout -b harbour-hernad hernad/harbour
Branch harbour-hernad set up to track remote branch harbour from hernad. Switched to a new branch 'harbour-hernad'
Izmjenjeno od Ernad Husremović prije skoro 15 godina
idem prije toga pushirati u main repos rezultate mergiranja sa vsasa repos-om
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git checkout clipper
Switched to branch 'clipper' Your branch is ahead of 'origin/clipper' by 45 commits. oops git je read-only
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git push origin clipper:clipper
fatal: protocol error: expected sha/ref, got ' ---------------------------------------------- The git:// url is read-only. Please see http://gitorious.bring.out.ba/fmk/rnal for the push url, if you're a committer. ----------------------------------------------'
podešavam u .git/config ssh url:
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git@gitorious.bring.out.ba:fmk/rnal.git
sada push radi
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git push origin clipper:clipper
Counting objects: 410, done. Compressing objects: 100% (69/69), done. Writing objects: 100% (358/358), 75.78 KiB, done. Total 358 (delta 286), reused 356 (delta 284) => Syncing Gitorious... [OK] To git@gitorious.bring.out.ba:fmk/rnal.git e7d592e..7c9e3ff clipper -> clipper
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git push origin harbour:harbour
Counting objects: 10, done. Compressing objects: 100% (1/1), done. Writing objects: 100% (5/5), 850 bytes, done. Total 5 (delta 4), reused 5 (delta 4) => Syncing Gitorious... [OK] To git@gitorious.bring.out.ba:fmk/rnal.git a54ce67..cd4f211 harbour -> harbour
Izmjenjeno od Ernad Husremović prije skoro 15 godina
vratimo se na moj lokalni clipper branch
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git checkout clipper-hernad
Switched to branch 'clipper-hernad'
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git fetch origin
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git merge origin/clipper
... tu dobijam sve vsasina promjene koje sam maloprije mergirao u glavni repos
Izmjenjeno od Ernad Husremović prije skoro 15 godina
ista procedura sa harbour branch-om
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git checkout harbour-hernad
Switched to branch 'harbour-hernad'
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git merge origin/harbour
Updating a54ce67..cd4f211 Fast forward cdx/rnal.ch | 2 +- co_add_operation_attributes.prg | 17 ++- doc_add_operations.prg | 44 ++++- glass_specif.prg | 1 + menu_codes.prg | 7 + menu_reports.prg | 3 + ral.prg | 357 +++++++++++++++++++++++++++++++++++++++ rpt_ral.prg | 309 +++++++++++++++++++++++++++++++++ tdb_rnal.prg | 4 + utility.prg | 5 + 10 files changed, 740 insertions(+), 9 deletions(-) create mode 100644 ral.prg create mode 100644 rpt_ral.prg
Izmjenjeno od Ernad Husremović prije skoro 15 godina
i sada push, gdje treba obrati pažnju na preslikavanje local-branch:remote-branch (clipper-hernad:clipper odnosno harbour-hernad:harbour)
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git push hernad clipper-hernad:clipper
Counting objects: 410, done. Compressing objects: 100% (69/69), done. Writing objects: 100% (358/358), 79.69 KiB, done. Total 358 (delta 286), reused 356 (delta 284) => Syncing Gitorious... [OK] To git@gitorious.bring.out.ba:~hernad/fmk/hernads-rnal.git e7d592e..7c9e3ff clipper-hernad -> clipper
bringout@bringout-developer-amd64:~/devel/fmk/rnal$ git push hernad harbour-hernad:harbour
Counting objects: 10, done. Compressing objects: 100% (1/1), done. Writing objects: 100% (5/5), 850 bytes, done. Total 5 (delta 4), reused 5 (delta 4) => Syncing Gitorious... [OK] To git@gitorious.bring.out.ba:~hernad/fmk/hernads-rnal.git a54ce67..cd4f211 harbour-hernad -> harbour
Izmjenjeno od Ernad Husremović prije skoro 15 godina
set_envars.sh PROJECTS¶
ažuriram envar i dodajem rnal
bringout@bringout-developer-amd64:~/devel/fmk$ vi set_envars.sh
Izmjenjeno od Ernad Husremović prije skoro 15 godina
bringout@bringout-developer-amd64:~/devel/fmk$ scripts/commit_push_all.sh "rnal clipper init"
scripts/commit_push_all.sh setujem BRANCH=clipper, REMOTE_REPOS=origin, REMOTE_BRANCH=clipper PROJECTS=fmk_lib fmk_common fin kalk fakt os ld virm kam epdv rnal ================ scripts/commit_push_all.sh : 2010-01-18-8 ================================================== . ... =================== rnal ================================ # On branch clipper nothing to commit (working directory clean) git push origin clipper Everything up-to-date ... ========================= /home/bringout/devel/fmk ================================= na kraju, commitujem glavni repos [clipper fcc4249] rnal clipper init 3 files changed, 5 insertions(+), 1 deletions(-) create mode 160000 rnal Counting objects: 7, done. Compressing objects: 100% (4/4), done. Writing objects: 100% (4/4), 490 bytes, done. Total 4 (delta 3), reused 0 (delta 0) => Syncing Gitorious... [OK] To git@gitorious.bring.out.ba:fmk/fmk.git 2dea113..fcc4249 clipper -> clipper
Izmjenjeno od Ernad Husremović prije skoro 15 godina
preporuka check_repositories.sh prije commit and push ...¶
ovo gore je ok, ali je najbolje da se prije te finalne operacije još jednom uradi:
bringout@bringout-developer-amd64:~/devel/fmk$ scripts/checkout_repositories.sh
pa onda commit and push:
bringout@bringout-developer-amd64:~/devel/fmk$ scripts/commit_push_all.sh "rnal clipper init"
Zašto ? Zato što smo možda čačkali po nekom sub repos-u i on se ne nalazi na željenom branch-u/poziciji. Ovako ćemo biti sigurno da pushiramo stanje gdje su svi sub-repos-i pozicionirani na posljedni status u clipper branch-u
Izmjenjeno od Ernad Husremović prije skoro 15 godina
bjasko je greškom notificiran o ovome ?¶
Pa nije. U startu sam uočio jednu stvar koja se kod nas inače ne dešava - mi pogrešno ovakvim stvarima ne poklanjamo potrebnu pažnju.
Ovakve operacije uradimo samo-neka-radi pa onda na to gubimo ogromno vrijeme ...
nema se vremena¶
bjaskove sysadmin aktivnosti su često obična "krpaža" "jer se nema vremena" (to je uobičajeni komentar)
da bih nas ta ušteda vremena kroz druge stvari koštala ogromno vrijeme
Izmjenjeno od Ernad Husremović prije skoro 15 godina
Izmjenjeno od Ernad Husremović prije skoro 15 godina
postavlja se pitanje da li bjasko može napraviti upgrade ove skrite ? on nije programer ?
Smatram da sysadmin te stvari mora naučiti raditi ... ali ono što definitivno nema dileme jeste da se:- mora uočiti da je određeno rješenje parcijalno - krpaža
- da se otvori ticket koji će stvar riješiti kako treba za sva vremena
Izmjenjeno od Ernad Husremović prije više od 14 godina
- Status promijenjeno iz Dodijeljeno u Zatvoreno