Review Request 121916: [Kalzium] Bug Fix 342583: Color preference changes are not reflected in the periodic table immediately

[Shalin Shah]

> On Jan. 11, 2015, 3:42 p.m., Etienne Rebetez wrote:
> > Ship It!
> 
> Shalin Shah wrote:
>     Thanks for giving me developer right. So I should merge my branch with master which is Applications/14.12, right? Also, can you help me out with merging patch? How should I go about it?
> 
> Jeremy Whiting wrote:
>     master branch is called "master" Applications/14.12 branch is where point releases will come from until master is branched for Applications/15.03 or whatever the next major version is going to be called.
>     
>     As for how to merge, I typically check that my local master is up to date, then rebase the branch on master, then checkout master and merge the branch. Then push to master.
> 
> Jeremy Whiting wrote:
>     Note that since this is a bugfix it should go to Applications/14.12 so it will be in the next release from that branch which will be tagged on Jan 29th. But it also needs to go to master.
> 
> Etienne Rebetez wrote:
>     Yes, what Jeremy is saying:-)
>     I think you should read this: https://techbase.kde.org/Development/Git.
> 
> Shalin Shah wrote:
>     So, I merged patch, committed and tried to push to master. But I get error. 
>     
>     
>     shalin at Shalin-MacBookPro:~/kde/kde/kalzium > git push git at git.kde.org:kalzium master
>     Counting objects: 34, done.
>     Compressing objects: 100% (4/4), done.
>     Writing objects: 100% (4/4), 526 bytes | 0 bytes/s, done.
>     Total 4 (delta 3), reused 0 (delta 0)
>     remote: Audit failure - Commit 1ec602534fd1d40f2b967027200d9b0a3af5bc72 - Non-full name: shalinshah1993
>     remote: Audit failure - Commit 1ec602534fd1d40f2b967027200d9b0a3af5bc72 - Non-full name: shalinshah1993
>     remote: FATAL: VREF/kde-update-checks: helper program exit status 256
>     remote: Push declined - commits failed audit
>     remote: error: hook declined to update refs/heads/master
>     To git at git.kde.org:kalzium
>      ! [remote rejected] master -> master (hook declined)
>     error: failed to push some refs to 'git at git.kde.org:kalzium'
> 
> Jeremy Whiting wrote:
>     Yep, you need to set the author full name, set that up in your .gitconfig with git config user.name = "your name" or whatnot, then git commit --amend --reset-author to set the author to your new values.

I did what you said. However, I still get error. Could I also do git config --global user.name "name" & similarly for email? 

shalin at Shalin-MacBookPro:~/kde/kde/kalzium > git push git at git.kde.org:kalzium master
Counting objects: 34, done.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 525 bytes | 0 bytes/s, done.
Total 4 (delta 3), reused 0 (delta 0)
remote: Audit failure - Commit f7b32ff61a9c4c374779e27b5f7b5b55488e4b51 - Non-full name: =
remote: Audit failure - Commit f7b32ff61a9c4c374779e27b5f7b5b55488e4b51 - Non-full name: =
remote: FATAL: VREF/kde-update-checks: helper program exit status 256
remote: Push declined - commits failed audit
remote: error: hook declined to update refs/heads/master
To git at git.kde.org:kalzium
 ! [remote rejected] master -> master (hook declined)
error: failed to push some refs to 'git at git.kde.org:kalzium'


- Shalin


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/121916/#review73753
-----------------------------------------------------------


On Jan. 8, 2015, 11:38 a.m., Shalin Shah wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/121916/
> -----------------------------------------------------------
> 
> (Updated Jan. 8, 2015, 11:38 a.m.)
> 
> 
> Review request for KDE Edu and Etienne Rebetez.
> 
> 
> Repository: kalzium
> 
> 
> Description
> -------
> 
> Color of the pse elements is updated as soon as the preferences for gradient color or scheme color are changed. 
> 
> 
> Diffs
> -----
> 
>   src/kalzium.cpp 2e85cf8 
> 
> Diff: https://git.reviewboard.kde.org/r/121916/diff/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Shalin Shah
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-edu/attachments/20150112/bba241da/attachment-0001.html>