Merging all fixes for 2.9

[Dmitry Kazakov]

Rebase will change all the sha1 values. I wouldn't like it. Too many
complications for such a small trouble.

On Thu, Jan 22, 2015 at 9:29 PM, Jaroslaw Staniek <staniek at kde.org> wrote:

> No, revert created new commit, that's the same what happens in 2.9 now »
> blurry history when it happens often.
>
> Solution: git checkout calligra/2.9
> git checkout -b 29fix
> (use rebase -i to remove mistake commits)
> git checkout calligra/2.9
> git merge 29fix
>
> (untested, use git cherry to double check)
>
> PS: I thought from the very beginning that you'd rebase 2.9 on master
> since it is FF. I.e
> just pull -rebase.
>
> On Thursday, 22 January 2015, Inge Wallin <inge at lysator.liu.se> wrote:
> > On Thursday, January 22, 2015 14:34:07 Jaroslaw Staniek wrote:
> >> Good, would it be possible to skip the recent buggy commit
> >> 2c40d8b87db167dd1d77341daabb2ed7837ee46b
> >> ?
> >
> > I don't know how.  Except first merge it, buggy commit and all, and then
> revert
> > that particular commit.
> >
> > But why don't you revert it in 2.9 already?
> >
> >         -Inge
> >
> >> On Thursday, 22 January 2015, Inge Wallin <inge at lysator.liu.se> wrote:
> >> > On Thursday, January 22, 2015 12:02:47 Cyrille Berger wrote:
> >> >> On 2015-01-19 22:35, Inge Wallin wrote:
> >> >> > On Monday, January 19, 2015 17:25:33 Inge Wallin wrote:
> >> >> >> On Monday, January 19, 2015 17:26:45 Boudewijn Rempt wrote:
> >> >> >> > If you do, I think it should be an ordinary merge, not a squash.
> >> >> >>
> >> >> >> yes, agree.
> >> >> >
> >> >> > Done.  It went totally without problems.
> >> >> >
> >> >> > I think we should do this every 3-5 days at least so that we don't
> end
> >> >> > up with
> >> >> > a big problem that will be difficult to unwind later.
> >> >>
> >> >> That was the original plan, but nobody had the time to do it until
> now I
> >> >> guess :) And that is also why we "froze" master.
> >> >
> >> > As I mentioned on IRC, I am willing to do this 2-3 time per week.  In
> >>
> >> fact, I
> >>
> >> > was planning to do it again tonight.
> >> >
> >> >         -Inge
> >> >
> >> > _______________________________________________
> >> > calligra-devel mailing list
> >> > calligra-devel at kde.org
> >> > https://mail.kde.org/mailman/listinfo/calligra-devel
> > _______________________________________________
> > calligra-devel mailing list
> > calligra-devel at kde.org
> > https://mail.kde.org/mailman/listinfo/calligra-devel
> >
>
> --
> regards, Jaroslaw Staniek
>
> KDE:
> : A world-wide network of software engineers, artists, writers, translators
> : and facilitators committed to Free Software development - http://kde.org
> Calligra Suite:
> : A graphic art and office suite - http://calligra.org
> Kexi:
> : A visual database apps builder - http://calligra.org/kexi
> Qt Certified Specialist:
> : http://www.linkedin.com/in/jstaniek
>
> _______________________________________________
> calligra-devel mailing list
> calligra-devel at kde.org
> https://mail.kde.org/mailman/listinfo/calligra-devel
>
>


-- 
Dmitry Kazakov
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20150123/27ca42d5/attachment.htm>