On Friday 03 July 2015 15:25:50 R.Harish Navnit wrote: > On Fri, Jul 3, 2015 at 12:51 PM, Pali Rohár <pali.ro...@gmail.com> wrote: > > > > > Submitted? But I do not see it in master branch: > > http://quickgit.kde.org/?p=kopete.git&a=shortlog&h=master > > > > So why? Where is problem? > > > I've prepared a separate branch - frameworks[1].
Noooooo. Please use your own personal repository. Do not mess main kopete git repository. I do not want to see another octopus merges in kopete git history and your commits are easy to cherry-pick/rebase. Plus only 3 people have permission to delete branches in main kopete repository and *nobody* has permission to rewrite branch history (to do force push). And closed review on reviewboard means that change is either in master branch or change was discarded. So please do not do that! You just complicate it... > I'm bringing in changes > from my scratch repo[2] to the same and will inform you when it's merge > ready(with master). > > [1] > http://quickgit.kde.org/?p=kopete.git&a=shortlog&h=1eaae102da8987a8215ec82a8e6a83719722d700 > [2] > http://quickgit.kde.org/?p=clones%2Fkopete%2Frharishnavnit%2Fframeworks.git > > > Warm Regards. > > Thanking You, > R.Harish Navnit > The Enigma <http://harishnavnit.wordpress.com/> I repeat what I already told: * qt3 --> qt4 rewrite code can be merged/pushed into master immediately, we do not need to wait until all code is ported completely into qt4 * qt4/kde4 --> qt5/kf5 will be merged into kopete master after full kopete codebase will be ported * if you want to push something into kopete master, prepare new branch in your own personal repository (rebased on top of main kopete master) and write me what you want to include... I will look at it and if everything will be OK I push your changes (from your branch). -- Pali Rohár pali.ro...@gmail.com _______________________________________________ kopete-devel mailing list kopete-devel@kde.org https://mail.kde.org/mailman/listinfo/kopete-devel
