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

[Andreas Pakulat]

On 01.01.11 15:01:59, Nicolás Alvarez wrote:
> Tags are currently being converted like this:
> 
> http://simplest-image-hosting.net/jpg-0-plasma-desktopgw6347
> (empty-diff commits diverging from the correct point in the branch,
> and tags pointing at those diverging commits)

Thats normal when tags are updated.

> I think they used to get converted like this:
> http://simplest-image-hosting.net/jpg-0-plasma-desktopvz6347
> (a linear history with tags directly in the tagged revisions, no empty commits)

Thats normal when tags are not updated.

> Was this a recent svn2git change? Intentional or a side-effect of other changes?

AFAIK it was always this way, I'm not sure how to fix it right now, but
the rule files for kdevelop/kdevplatform should have some hints.

> And if I'm imagining things and it never looked like in the second
> screenshot, isn't it a good idea to make it that way?

Maybe, but it means changing history, svn doesn't have any tags. The
fact that there's a tags/ subdir in our svn repo and that one is used to
emulate tags is just that, an emulation. In addition the tags have been
historically created before the release, i.e. they're created, then
tarballs from the tag, then build-fixes are done to branch and the
commits are cherry-picked into the tag. Thats why there's an unnamed
branch on which the actual tag is in the git history.

> Conceptually, tagging doesn't diverge the code, it marks the current
> branch state with a version number. And tag commit messages are in the
> annotated tag itself already.

If you want that (if it is possible at all, as I said some tags only
cherry-pick certain commits and hence the tag doesn't really correspond
to a specific state of the branch), you'll have to follow up history
manually and update the tag in the git repository after conversion.
AFAIK.

Andreas

-- 
There is a fly on your nose.