[Kmymoney-devel] Guidance needed please

[aga]

On 20/03/15 11:01, Alvaro Soliverez wrote:
> Hi Allan,
> Usually, when you want to cherry pick a commit, you shouldn't rebase.
>
> the work would go like this.
>
> git checkout master
> ...do some coding...
> git commit
> git push origin master
>
>
> ...now to push it to stable branch...
> git checkout 4.7
> git cherry-pick <commit id>
> git push origin 4.7
>
> done!
>
> You may use branches at some points, but the cherry-picking to stable
> should be essentially that.
> Can you tell some more about your specific steps?
>
> Regards,
> Alvaro

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)

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


> On Fri, Mar 20, 2015 at 7:46 AM aga <agander93 at gmail.com
> <mailto:agander93 at gmail.com>> wrote:
>
>     Having pushed a bug fix, I then needed to to cherry-pick to 4.7.
>
>     With my previous struggles doing this, I took some care.  However, on
>     doing the git rebase 4.7, I think it was, I got a couple of screens full
>     of whitespace errors (hundreds) and many many conflicts.
>
>     Assuming it was down to me, I backed out and tried again, with the same
>     result.  And again.
>
>     So, I decided that it must be that a lot of content of master needed
>     updating on 4.7.  I started to work my way through the issues, and it
>     went on and on and on.  Anyway, when I got to 1.30am, I stopped.
>
>     I haven't pushed, and there is still more to do, but I don't know how
>     much.  Most seemed related to the online banking changes, and it now
>     occurs to me that it may be, or is likely to be, that some of the mass
>     should not be getting added to 4.7, possibly not bug fixes but new
>     features.  I don't know, and the conflicts don't indicate to what issue
>     they relate.
>
>     Have I been wasting my time?  How do I know if a conflict needs to be
>     sorted for 4.7?  How do I proceed with the conflicts, and what do I need
>     to do to ignore a conflict, if that is what is required.
>
>     I'm hoping that the work I've done is not totally wasted.
>
>     Thanks.
>
>     Allan
>     _________________________________________________
>     KMyMoney-devel mailing list
>     KMyMoney-devel at kde.org <mailto:KMyMoney-devel at kde.org>
>     https://mail.kde.org/mailman/__listinfo/kmymoney-devel
>     <https://mail.kde.org/mailman/listinfo/kmymoney-devel>
>