Merge or Cherry-Pick?

[Thiago Macieira]

Em terça-feira, 1 de fevereiro de 2011, às 09:31:40, David Jarvie escreveu:
> On Mon, January 31, 2011 11:27 pm, Thiago Macieira wrote:
> > On Monday, 31 de January de 2011 23:34:39 Arno Rehn wrote:
> >> I guess that won't quite work when there are commits specific to 4.6
> >> in
> >> the
> >> 4.6 branch that shouldn't end up in master. And it clutters history
> >> with
> >> tons of merges.
> > 
> > Then let's solve the problem by not having anything specific to 4.6. If
> > it belongs in the stable release, it belongs in the next stable release
> > too.
> 
> That's not always true. Some changes *will* be specific to 4.6, because
> sections of code in master can get rewritten, features added or removed,
> so the changes won't be applicable there.

That's not a problem or an excuse.

Make the change in 4.6, merge to master, fix the conflicts and then push both 
branches.

-- 
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/8c3309ea/attachment.sig>