Empty merges per release

[Thiago Macieira]

Em Wednesday, 27 de April de 2011, às 12:46:40, Oswald Buddenhagen escreveu:
> if you want to make that git feature useful in the kde-ish cherry-pick
> regime, tag the stable branch points - if you want to know when a commit
> on a stable branch hit master, you need the extra step of following the
> "cherry-picked from" message. this could be actually scripted rather
> easily.
> 
> > I recommend at least once, after a release, that the tag is merged
> > back into master, using strategy "ours" if necessary.
> >
> > 
> 
> great idea ... all cherry-picked commits duplicated (oh well, who cares,
> given all that scripty crap in the history), and still the risk of
> falsifying the history by claiming that all commits were merged while
> they might have not been.

A shadow tag might be useful then.
-- 
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/20110427/ca753963/attachment.sig>