[Kmymoney-devel] Guidance needed please

[aga]

On 20/03/15 15:29, Alvaro Soliverez wrote:
> What's the commit id of what you are trying to cherry pick

Thanks Alvaro it's -

(cherry picked from commit
 >     71bbf7b53125edfd37047f0bdba1fe__edd88a6d26)

Allan


? I'll try it here
>
> On Fri, Mar 20, 2015 at 12:19 PM aga <agander93 at gmail.com
> <mailto:agander93 at gmail.com>> wrote:
>
>     I'm afraid there still seems to be a problem, but it's with the
>     cherry-pick.  It appears to go correctly, but git log shows -
>
>     commit a0dac2d1a6ede4bca0ba48da03783f__ad6aca3dbb
>     Author: Allan Anderson <agander93 at gmail.com
>     <mailto:agander93 at gmail.com>>
>     Date:   Sun Feb 8 22:09:30 2015 +0000
>
>           BUG:343106
>           Fix unhelpful messages when processing schedules at startup.
>           Fix 'next check number' message when updating a schedule for a
>           non-checking schedule type.
>
>           (cherry picked from commit
>     71bbf7b53125edfd37047f0bdba1fe__edd88a6d26)
>
>           Conflicts:
>               kmymoney/kmymoney.cpp
>
>     It's the conflict I don't understand.
>
>     If I look in qgit, the diff for KMyMoney.cpp shows the addition of about
>     a dozen online banking methods, which appear to be in the file already.
>        I see no conflict markers.
>
>     I saw this earlier, too, but am now using a new sandbox.
>
>     So, I'm afraid I still don't know how to proceed.
>
>     Allan
>
>
>     On 20/03/15 11:35, Alvaro Soliverez wrote:
>      > Hi,
>      >  From the looks of that, you were working on the 4.7 branch
>     directly. In
>      > that case, it's better to use rebase.
>      >
>      > ie. if you checkout -b a new branch, use rebase and merge
>      >      If you want to quickly fetch a commit from another branch, use
>      > cherry-pick
>      > For example, work on master using checkout-b, rebase, and merge.
>     Later
>      > on, use cherry-pick to copy it to 4.7.
>      >
>      >
>      > Now, let's see what you did in the specific steps.
>      >
>      >
>      > On Fri, Mar 20, 2015 at 8:16 AM aga <agander93 at gmail.com
>     <mailto:agander93 at gmail.com>
>      > <mailto:agander93 at gmail.com <mailto:agander93 at gmail.com>>> wrote:
>      >
>      >
>      >
>      >     Hi Alvaro
>      >
>      >     Thanks for that.  What I doing is based on several emails of
>     yours -
>      >     [Kmymoney-devel]
>      >     Git workflow after backporting to origin/4.6
>      >     30-06-2012
>      >
>      >     git checkout 4.7
>      >     git fetch origin && git reset --hard origin/4.7
>      >     git checkout -b backportFixes
>      >     (work on the fixes, cherry-pick from other branches, etc.)
>      >
>      >     git checkout 4.7
>      >     git cherry-pick -x hash (this is my addition)
>      >
>      > If there were multiple commit, cherry picking is not that easy,
>     as you
>      > have to do it in the right. It'd be much better to rebase and merge.
>      >
>      > However, it cherry picking worked, all that was left to do was
>     pushing.
>      >
>      > The next steps are redundant and prone to cause unnecessary problems
>      > when used together with cherry-pick.
>      >
>      >     Once you are done with that, and I think the point where you
>     are at now:
>      >     git checkout 4.7
>      >     git pull -r origin 4.7
>      >     git checkout backportFixes
>      >     git rebase 4.7
>      >     git checkout 4.7
>      >     git merge backportFixes
>      >     git push kde:kmymoney 4.7
>      >
>      >
>      >     Thanks again
>      >
>      >     Allan
>      >
>      >
>