[Kde-scm-interest] Re: Minor difference in tag conversion

[Eike Hein]

On 1/1/2011 9:32 PM, Chani wrote:
> this makes it sound like kde's release "tags" actually correspond more to git
> branches than git tags. :)

Actually git branches and git tags are both just labels attached
to a particular sha1 hash. The "branch-ness" happens entirely by
way of references to parent commit sha1s in the metadata of the
commit with that sha1 hash, and a comment pointed to by a tag ref
can have parents just as a commit pointed to by a branch ref can.

Dirk's existing behavior with the KDE SC of tagging a release
branch and then comitting to the tag to merge in additional stuff
will indeed have to change in the future. He's going to have to
retag a point somewhere in the release branch commit chain instead.
Or if there really is a need to cherry-pick stuff from the release
branch but avoid having other changes from that branch in the tag,
that would constitute a distinct fork from the release branch in-
deed. That's essentially what Nicolas' first shot is showing, ex-
cept the breakout commit doesn't actually contain any changes.


-- 
Best regards,
Eike Hein