V
12  
Tags
There are no tags for this page.
Attachments
Koha Croatian user group
Signing off patches

git checkout -b bug_xxxx origin/master
git bz apply XXXX
git commit --amend -s
git bz attach -e XXXX HEAD

Ako ne prolazi database update:

git am --abort
git am -3iu /tmp/Update-database-patch-xxxxx.patch

resolve conflict ili ako otkriješ grešku koju znaš popraviti, onda:

git add <file>
git am --resolved

ako zeznem merge:

git diff origin/master opac/opac-detail.pl
vi opac/opac-detail.pl
git add opac/opac-detail.pl
git commit --amend

edit kohaversion.pl

Ako patch ima više fajlova:

git bz apply 7743
git am --abort
git am -3iu /tmp/Update-opac-userpl-to-use-KohaDates-TT-plugin-hYYLn8.patch
vi opac/opac-user.pl
git add opac/opac-user.pl
git am --resolved

idem ispočetka:

git bz apply 7743

a na ono što je prošlo apply odgovaram s "n"

onda rebase, na zadnji prije patcha kojeg testiram

git rebase -i 35279926b3865b003c6bd01d5c5378addfa903a9

tu je sad neku search/replace, ne sjećam se šta treba zamijeniti - s/??/e/

onoliko puta koliko ima fajlova:

git commit --amend -s
git rebase --continue
git commit --amend -s
git rebase --continue
git commit --amend -s
git rebase --continue
git commit --amend -s
git rebase --continue
git commit --amend -s
git rebase --continue
git commit --amend -s
git rebase --continue
git commit --amend -s
git rebase --continue
git commit --amend -s
git rebase --continue

git bz attach 7743 HEAD^^^^^^^ -e
git bz attach 7743 HEAD^^^^^^
git bz attach 7743 HEAD^^^^^
git bz attach 7743 HEAD^^^^
git bz attach 7743 HEAD^^^
git bz attach 7743 HEAD^^
git bz attach 7743 HEAD^
git bz attach 7743 HEAD

 

Upload Files

Click "Browse" to find the file you want to upload. When you click "Upload file" your file will be uploaded and added to the list of attachments for this page.

Maximum file size: 50MB

 
 
 
File Name Author Date Uploaded Size

Save Page As

Enter a meaningful and distinctive title for your page.

Page Title:

Tip: You'll be able to find this page later by using the title you choose.

Page Already Exists

There is already a page named XXX. Would you like to:

Save with a different name:

Save the page with the name "XXX"

Append your text to the bottom of the existing page named: "XXX"

Upload Files

Click "Browse" to find the file you want to upload. When you click "Add file" this file will be added to the list of attachments for this page, and uploaded when you save the page.

 
 
 
Add Tags

Enter a tag and click "Add tag". The tag will be saved when you save the page.

Tag: 

Suggestions: