[Kde-scm-interest] Fwd: ideas to git conversion

[Thiago Macieira]

On Thursday 04 December 2008 18:00:57 Raul Fernandes wrote:
> > because if a fix is applied to the oldest live branch, then it will have
> > to be merged into the later live branches:
>
> I think that the fixes is generally backported, not the way you said.
> In any case, the merge is not the solution. It has to be
> cherry-picking (getting one patch and applying to other branch). The
> work will be almost the same if there are one or more repositories.

I disagree with you -- I agree with Johannes. Fixes should be made in the 
earliest branch where they make sense. Then the full branch is merged into the 
later versions.

That ensures that nothing is forgotten.

And, like I showed, it works fine in Qt.

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Software Engineer - Nokia, Qt Software
  Qt Software is hiring - ask me
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20081204/551b6cb6/attachment.sig