<div dir="ltr">Hi,<br>Did you uninstall the previous version before installing 4.7?<br></div><br><div class="gmail_quote">On Fri, Mar 20, 2015 at 4:29 PM aga <<a href="mailto:agander93@gmail.com">agander93@gmail.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
<br>
On 20/03/15 16:34, Alvaro Soliverez wrote:<br>
> Hi,<br>
> The problem doesn't seem to be in your git workflow, but rather a<br>
> conflict when applying the patch.<br>
><br>
> asoliver@zeon:~/desarrollo/<u></u>kmymoney> git cherry-pick<br>
> 71bbf7b53125edfd37047f0bdba1fe<u></u>edd88a6d26<br>
> error: could not apply 71bbf7b... BUG:343106<br>
> hint: after resolving the conflicts, mark the corrected paths<br>
> hint: with 'git add <paths>' or 'git rm <paths>'<br>
> hint: and commit the result with 'git commit'<br>
> asoliver@zeon:~/desarrollo/<u></u>kmymoney> git status<br>
> On branch 4.7<br>
> You are currently cherry-picking commit 71bbf7b.<br>
> (fix conflicts and run "git cherry-pick --continue")<br>
> (use "git cherry-pick --abort" to cancel the cherry-pick operation)<br>
><br>
> Changes to be committed:<br>
><br>
> modified: kmymoney/dialogs/<u></u>keditscheduledlg.cpp<br>
> modified: kmymoney/dialogs/<u></u>kenterscheduledlg.cpp<br>
> modified: kmymoney/dialogs/<u></u>transactioneditor.cpp<br>
> modified: kmymoney/dialogs/<u></u>transactioneditor.h<br>
><br>
> Unmerged paths:<br>
> (use "git add <file>..." to mark resolution)<br>
><br>
> both modified: kmymoney/kmymoney.cpp<br>
><br>
><br>
> Running "git diff kmymoney/kmymoney.cpp" shows the conflict with HEAD.<br>
> It seems that lines are added and nothing is deleted.<br>
><br>
><br>
> diff --cc kmymoney/kmymoney.cpp<br>
> index c1c23cb,d8eaadf..0000000<br>
> --- a/kmymoney/kmymoney.cpp<br>
> +++ b/kmymoney/kmymoney.cpp<br>
> @@@ -7328,6 -7482,151 +7327,154 @@@ void KMyMoneyApp::<u></u>slotAccountUpdateOnli<br>
> slotUpdateActions();<br>
> }<br>
><br>
> ++<<<<<<< HEAD<br>
> ++=======<br>
> + void KMyMoneyApp::<u></u>slotNewOnlineTransfer(void)<br>
> + {<br>
> + kOnlineTransferForm *transferForm = new kOnlineTransferForm(this);<br>
> + if (!d->m_selectedAccount.id().<u></u>isEmpty()) {<br>
> + transferForm-><u></u>setCurrentAccount(d->m_<u></u>selectedAccount.id());<br>
> + }<br>
> ...<br>
><br>
><br>
> So, I would make sure this is what you intended, remove the conflict<br>
> lines, build that version and test it.<br>
><br>
> Then, you'll have to mark the conflict resolved by running:<br>
><br>
> git add kmymoney/kmymoney.cpp<br>
> git commit<br>
><br>
<br>
We should be so lucky!<br>
<br>
It built OK, but on running, it crashed immediately -<br>
<br>
Application: KMyMoney (kmymoney), signal: Segmentation fault<br>
Using host libthread_db library "/lib64/libthread_db.so.1".<br>
[KCrash Handler]<br>
#5 0x000000000000ac16 in ()<br>
#6 0x00007f9a5f0938d4 in qt_plugin_instance() () at<br>
/home/aga/GITD/kmymoney/<u></u>kmymoney/plugins/onlinetasks/<u></u>national/<u></u>nationalonlinetasksloader.cpp:<u></u>36<br>
#7 0x00007f9a73b26dac in KLibrary::factory(char const*) () at<br>
/usr/lib64/libkdecore.so.5<br>
#8 0x00007f9a73b2c5b7 in KPluginLoader::factory() () at<br>
/usr/lib64/libkdecore.so.5<br>
#9 0x00007f9a77c8b3c1 in<br>
KMyMoneyPlugin::PluginLoader::<u></u>loadPlugin(KPluginInfo*)<br>
(error=0x7ffff587e850, args=..., parent=<optimized out>,<br>
parentWidget=0x0, this=0x21d0f90) at /usr/include/kservice.h:577<br>
#10 0x00007f9a77c8b3c1 in<br>
KMyMoneyPlugin::PluginLoader::<u></u>loadPlugin(KPluginInfo*)<br>
(error=0x7ffff587e850, args=..., parent=<optimized out>, this=0x21d0f90)<br>
at /usr/include/kservice.h:556<br>
#11 0x00007f9a77c8b3c1 in<br>
KMyMoneyPlugin::PluginLoader::<u></u>loadPlugin(KPluginInfo*)<br>
(this=this@entry=0x21d3350, info=0x21cb940) at<br>
/home/aga/GITD/kmymoney/<u></u>kmymoney/plugins/pluginloader.<u></u>cpp:98<br>
#12 0x00007f9a77c8bbef in KMyMoneyPlugin::PluginLoader::<u></u>loadPlugins()<br>
(this=0x21d3350) at<br>
/home/aga/GITD/kmymoney/<u></u>kmymoney/plugins/pluginloader.<u></u>cpp:86<br>
#13 0x0000000000465b59 in KMyMoneyApp::loadPlugins()<br>
(this=this@entry=0x1709b30) at<br>
/home/aga/GITD/kmymoney/<u></u>kmymoney/kmymoney.cpp:7038<br>
#14 0x000000000049ccd4 in KMyMoneyApp::KMyMoneyApp(<u></u>QWidget*)<br>
(this=0x1709b30, parent=<optimized out>, __in_chrg=<optimized out>,<br>
__vtt_parm=<optimized out>) at<br>
/home/aga/GITD/kmymoney/<u></u>kmymoney/kmymoney.cpp:395<br>
#15 0x000000000045e3eb in main(int, char**) (argc=1,<br>
argv=0x7ffff587f398) at /home/aga/GITD/kmymoney/<u></u>kmymoney/main.cpp:157<br>
<br>
But, /GITD/kmymoney/kmymoney/<u></u>plugins/onlinetasks does not exist in 4.7,<br>
nor the other onlinebanking plugins either.<br>
<br>
Perhaps they are only in master.<br>
<br>
Allan<br>
<br>
<br>
<br>
> On Fri, Mar 20, 2015 at 1:03 PM aga <<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a><br>
> <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a>>> wrote:<br>
><br>
><br>
><br>
> On 20/03/15 15:29, Alvaro Soliverez wrote:<br>
> > What's the commit id of what you are trying to cherry pick<br>
><br>
> Thanks Alvaro it's -<br>
><br>
> (cherry picked from commit<br>
> > 71bbf7b53125edfd37047f0bdba1fe<u></u>____edd88a6d26)<br>
><br>
> Allan<br>
><br>
><br>
> ? I'll try it here<br>
> ><br>
> > On Fri, Mar 20, 2015 at 12:19 PM aga <<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a><br>
> <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a>><br>
> > <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a> <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a>>>> wrote:<br>
> ><br>
> > I'm afraid there still seems to be a problem, but it's with the<br>
> > cherry-pick. It appears to go correctly, but git log shows -<br>
> ><br>
> > commit a0dac2d1a6ede4bca0ba48da03783f<u></u>____ad6aca3dbb<br>
> > Author: Allan Anderson <<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a><br>
> <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a>><br>
> > <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a> <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a>>>><br>
> > Date: Sun Feb 8 22:09:30 2015 +0000<br>
> ><br>
> > BUG:343106<br>
> > Fix unhelpful messages when processing schedules at<br>
> startup.<br>
> > Fix 'next check number' message when updating a<br>
> schedule for a<br>
> > non-checking schedule type.<br>
> ><br>
> > (cherry picked from commit<br>
> > 71bbf7b53125edfd37047f0bdba1fe<u></u>____edd88a6d26)<br>
> ><br>
> > Conflicts:<br>
> > kmymoney/kmymoney.cpp<br>
> ><br>
> > It's the conflict I don't understand.<br>
> ><br>
> > If I look in qgit, the diff for KMyMoney.cpp shows the<br>
> addition of about<br>
> > a dozen online banking methods, which appear to be in the<br>
> file already.<br>
> > I see no conflict markers.<br>
> ><br>
> > I saw this earlier, too, but am now using a new sandbox.<br>
> ><br>
> > So, I'm afraid I still don't know how to proceed.<br>
> ><br>
> > Allan<br>
> ><br>
> ><br>
> > On 20/03/15 11:35, Alvaro Soliverez wrote:<br>
> > > Hi,<br>
> > > From the looks of that, you were working on the 4.7 branch<br>
> > directly. In<br>
> > > that case, it's better to use rebase.<br>
> > ><br>
> > > ie. if you checkout -b a new branch, use rebase and merge<br>
> > > If you want to quickly fetch a commit from another<br>
> branch, use<br>
> > > cherry-pick<br>
> > > For example, work on master using checkout-b, rebase, and<br>
> merge.<br>
> > Later<br>
> > > on, use cherry-pick to copy it to 4.7.<br>
> > ><br>
> > ><br>
> > > Now, let's see what you did in the specific steps.<br>
> > ><br>
> > ><br>
> > > On Fri, Mar 20, 2015 at 8:16 AM aga <<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a><br>
> <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a>><br>
> > <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a> <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a>>><br>
> > > <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a> <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a>><br>
> <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a> <mailto:<a href="mailto:agander93@gmail.com" target="_blank">agander93@gmail.com</a>>>><u></u>> wrote:<br>
> > ><br>
> > ><br>
> > ><br>
> > > Hi Alvaro<br>
> > ><br>
> > > Thanks for that. What I doing is based on several<br>
> emails of<br>
> > yours -<br>
> > > [Kmymoney-devel]<br>
> > > Git workflow after backporting to origin/4.6<br>
> > > 30-06-2012<br>
> > ><br>
> > > git checkout 4.7<br>
> > > git fetch origin && git reset --hard origin/4.7<br>
> > > git checkout -b backportFixes<br>
> > > (work on the fixes, cherry-pick from other branches, etc.)<br>
> > ><br>
> > > git checkout 4.7<br>
> > > git cherry-pick -x hash (this is my addition)<br>
> > ><br>
> > > If there were multiple commit, cherry picking is not that<br>
> easy,<br>
> > as you<br>
> > > have to do it in the right. It'd be much better to rebase<br>
> and merge.<br>
> > ><br>
> > > However, it cherry picking worked, all that was left to do was<br>
> > pushing.<br>
> > ><br>
> > > The next steps are redundant and prone to cause<br>
> unnecessary problems<br>
> > > when used together with cherry-pick.<br>
> > ><br>
> > > Once you are done with that, and I think the point<br>
> where you<br>
> > are at now:<br>
> > > git checkout 4.7<br>
> > > git pull -r origin 4.7<br>
> > > git checkout backportFixes<br>
> > > git rebase 4.7<br>
> > > git checkout 4.7<br>
> > > git merge backportFixes<br>
> > > git push kde:kmymoney 4.7<br>
> > ><br>
> > ><br>
> > > Thanks again<br>
> > ><br>
> > > Allan<br>
> > ><br>
> > ><br>
> ><br>
><br>
</blockquote></div>