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

List:       kde-pim
Subject:    Re: [Kde-pim] Git commit policy
From:       laurent Montel <montel () kde ! org>
Date:       2012-12-27 6:48:19
Message-ID: 2785171.TxI3kTpmlq () kspread
[Download RAW message or body]

Le mercredi 26 décembre 2012 17:19:46 Andras Mantia a écrit :
> Sérgio Martins wrote:
> > Hi,
> > 
> > 
> > We now have a page documenting kdepim git commit policy:
> > http://community.kde.org/KDE_PIM/Development/GitCommitPolicy
> > 
> > It mostly talks about how we handle forward porting.
> > 
> > Nothing in this page is new, we've been doing and enforcing this workflow
> > for months, I just wrote it down.
> 
> Sorry to ask, but was this discussed? It *is* new. I've been using master as
> my main branch for years. That is where I fix bugs in first place and
> sincerely I'm not really plan to change that.

You can fix in master and apply patch in 4.10
=> cd <kdepim-git-master> && git diff . ~/foo.diff && cd <kdepim-4.10> && git 
apply ~/foo.diff

Not  really hard to do. And it's that you do when you use git cherry-pick -x 
but with git cherry-pick you create a new commit number => not easy to know if 
a specific commit is in all branch.


Regards.


> IMO with every new policy a kitten dies, and I like kittens. :)
> 
> Andras
> _______________________________________________
> 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, Sweden (HQ) +46-563-540090

_______________________________________________
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]