<div dir="ltr"><div><div><div><div><div><div><div>Hi,<br></div>The problem doesn't seem to be in your git workflow, but rather a conflict when applying the patch.<br><br>asoliver@zeon:~/desarrollo/kmymoney> git cherry-pick 71bbf7b53125edfd37047f0bdba1feedd88a6d26<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/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/keditscheduledlg.cpp<br> modified: kmymoney/dialogs/kenterscheduledlg.cpp<br> modified: kmymoney/dialogs/transactioneditor.cpp<br> modified: kmymoney/dialogs/transactioneditor.h<br><br>Unmerged paths:<br> (use "git add <file>..." to mark resolution)<br><br> both modified: kmymoney/kmymoney.cpp<br><br><br></div>Running "git diff kmymoney/kmymoney.cpp" shows the conflict with HEAD. 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::slotAccountUpdateOnli<br> slotUpdateActions();<br> }<br> <br>++<<<<<<< HEAD<br>++=======<br>+ void KMyMoneyApp::slotNewOnlineTransfer(void)<br>+ {<br>+ kOnlineTransferForm *transferForm = new kOnlineTransferForm(this);<br>+ if (!d->m_selectedAccount.id().isEmpty()) {<br>+ transferForm->setCurrentAccount(d->m_selectedAccount.id());<br>+ }<br>...<br><br><br></div>So, I would make sure this is what you intended, remove the conflict lines, build that version and test it.<br><br></div>Then, you'll have to mark the conflict resolved by running:<br><br></div>git add kmymoney/kmymoney.cpp<br></div>git commit<br><br></div>Do not skip the build and testing part before pushing this to stable.<br><div><div><div><div><div><br><div>Regards,<br></div><div>Alvaro<br></div><div><br><br><br><br><div><br></div></div></div></div></div></div></div></div><br><div class="gmail_quote">On Fri, Mar 20, 2015 at 1:03 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 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>>> 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>
> Date: Sun Feb 8 22:09:30 2015 +0000<br>
><br>
> BUG:343106<br>
> Fix unhelpful messages when processing schedules at startup.<br>
> Fix 'next check number' message when updating a 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 addition of about<br>
> a dozen online banking methods, which appear to be in the 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 branch, use<br>
> > cherry-pick<br>
> > For example, work on master using checkout-b, rebase, and 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>>>> wrote:<br>
> ><br>
> ><br>
> ><br>
> > Hi Alvaro<br>
> ><br>
> > Thanks for that. What I doing is based on several 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 easy,<br>
> as you<br>
> > have to do it in the right. It'd be much better to rebase 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 unnecessary problems<br>
> > when used together with cherry-pick.<br>
> ><br>
> > Once you are done with that, and I think the point 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>
</blockquote></div>