Merge or Cherry-Pick?

[Thiago Macieira]

On Monday, 31 de January de 2011 18:37:32 Dawit A wrote:
> On Mon, Jan 31, 2011 at 5:27 PM, Thiago Macieira <thiago at kde.org> wrote:
> > On Monday, 31 de January de 2011 22:58:52 Andreas Pakulat wrote:
> >> Hi,
> >> 
> >> something that hasn't been written down as far as I can see (if I
> >> overlooked it, please point me to it) is what the policy on kdelibs is
> >> to be now wrt. merging vs. cherry-picking of changes in branches and
> >> master?
> > 
> > Commit to 4.6, merge 4.6 into master.
> 
> Doesn't that conflict the true and tried workflow of never back
> porting fixes that have not received some testing into a stable branch
> ? To me this seems to do things in reverse. Perhaps the workflow is
> supposed to be different in git ?

The workflow is supposed to be different. You're supposed to test the 4.6 branch 
first. If the fix is not good enough for 4.6, why would you put it in the 
repository at all?

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Development Frameworks
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20110201/43765cfa/attachment.sig>