[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-pim
Subject:    Re: [Kde-pim] Review Request 117245: Coding Style for transportresourcebase_p.h
From:       laurent Montel <montel () kde ! org>
Date:       2014-04-13 19:02:56
Message-ID: 16269472.M4zYkJOimm () linux-19td
[Download RAW message or body]

Is it possible to apply all theses commits to 4.13 branch ?
Each time that we make a fix in 4.13 we have a conflict in master.
It's not easy to work after that.

This morning 3 fix in 4.13 => 3 conflicts in master.

Master and 4.13 is same for the moment so apply it in 4.13 will not provide 
conflict after that.
And we merge in master after commit

Be carefull just commit in 4.13 branch

Regards


On dimanche 13 avril 2014 18:29:34 Kevin Krammer wrote:
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/117245/#review55663
> -----------------------------------------------------------
> 
> Ship it!
> 
> 
> Ship It!
> 
> - Kevin Krammer
> 
> On March 31, 2014, 4:32 p.m., Guy Maurel wrote:
> > -----------------------------------------------------------
> > This is an automatically generated e-mail. To reply, visit:
> > https://git.reviewboard.kde.org/r/117245/
> > -----------------------------------------------------------
> > 
> > (Updated March 31, 2014, 4:32 p.m.)
> > 
> > 
> > Review request for KDEPIM-Libraries and Dan Vrátil.
> > 
> > 
> > Repository: kdepimlibs
> > 
> > 
> > Description
> > -------
> > 
> > This is the second run.
> > 
> > Details can be seen at:
> >   http://techbase.kde.org/Policies/Kdepim_Coding_Style
> > 
> > Diffs
> > -----
> > 
> >   akonadi/transportresourcebase_p.h 4f4ca14
> > 
> > Diff: https://git.reviewboard.kde.org/r/117245/diff/
> > 
> > 
> > Testing
> > -------
> > 
> > 
> > Thanks,
> > 
> > Guy Maurel
> 
> _______________________________________________
> KDE PIM mailing list kde-pim@kde.org
> https://mail.kde.org/mailman/listinfo/kde-pim
> KDE PIM home page at http://pim.kde.org/

Laurent Montel | laurent.montel@kdab.com | KDE/Qt Senior Software Engineer
KDAB (France) S.A.S., a KDAB Group company
Tel. France +33 (0)4 90 84 08 53,  http://www.kdab.fr

-- 
Laurent Montel | laurent.montel@kdab.com | KDE/Qt Senior Software Engineer
KDAB (France) S.A.S., a KDAB Group company
Tel. France +33 (0)4 90 84 08 53,  http://www.kdab.fr


_______________________________________________
KDE PIM mailing list kde-pim@kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/
[prev in list] [next in list] [prev in thread] [next in thread]