I wonder what commit corresponds to Lazarus 1.4.2. There's an official git mirror at https://github.com/graemeg/lazarus.git, but I can't see there neither branches nor tags corresponding to releases (except for some oldies up to v0.9.28.2).

We want to stick with 1.4.2 for now, but apply some patches (both official fixes and ours).

Regards
Martin.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20151217/33289b01/attachment.html>

Martin Grajcar wrote

I wonder what commit corresponds to Lazarus 1.4.2. From past experience, and the way Lazarus Team uses SubVersion (tags

treated as branches) I couldn't find a accurate solution creating release tags in the Git mirror repository.

There's an official git mirror at https://github.com/graemeg/lazarus.git,

It's an unofficial git mirror, but well maintained for years (by me).

We want to stick with 1.4.2 for now, but apply some patches (both official fixes and ours).

I don't mind adding a release tag to mark a specific commit, but like I said, the way the Lazarus team uses SubVersion tags is rather odd. So the tags in git might not correspond 100% to what you expect in SubVersion repository.

Regards,
- Graeme -

2015-12-17 17:10 GMT+01:00 Graeme Geldenhuys
:

Vincent
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20151217/4e2cab42/attachment.html>

Vincent Snijders wrote

Maybe you should convert the svn to a git branch instead of a git tag.

I tried that it the past - tracking svn branches (seeing as svn tags are just like svn branches), at it inflated the Git repository size massively, because each branch was a 100% copy of all files. Branching is not as "cheap" in SVN like they are in Git. So I gave up on that idea too.

I started the Git mirror again from scratch, but then for a while I manually applied svn branch changes ("fixes" branches only) into git branches, but that was a manual process, and very time consuming. So I stopped that too.

So for the last few years I only track the Trunk branch which is now a 100% automated process.

As I said, I can tag git commits where SVN branches branched off of SVN Trunk, but that is where it will end. The Git mirror will not track any commits added to those SVN branches.

Regards,
- Graeme -

Martin Grajcar wrote

I wonder what commit corresponds to Lazarus 1.4.2.

With the limitation in mind (as mentioned in my other replies), I pushed a couple of release tags to Github.

Regards,
- Graeme -

17.12.2015 19:58, Graeme Geldenhuys ?????:

You can push tags after release announcements, there are no commits to tags after them.

Actually there are only 2 or 3 branches that do the 100% copy thing.

That are branches which branch only a subdirectory (or in the last case parent dir) of trunk. (that is the one svn feature git does not have.... changing the root folder in a branch)

The first 1 or 2 where just the lcl folder. To clone those it the duplication is needed. (at least I found no better way).

The there is an 1.4.x branch, that was based on the parent of trunk, and has no content. It is possible to skip this, and automatically follow all other branches.

And that will work, as long as no accidental or intentional svn branch of just one folder is created in future.

Hi Graeme!

On Thu, Dec 17, 2015 at 5:58 PM, Graeme Geldenhuys <

That's nice, thank you! However, after having executed git reset --hard v1.4.2 && make clean && make I've got Lazarus 1.5. As I understand it (or as I hope), there are just odd versions in the repository and switching to 1.5 was the very first done after releasing 1.4. So taking this commit and setting the version to 1.4.2 should be all I need?

Regards,
Martin.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20151217/028f9405/attachment.html>

Martin Grajcar wrote

As I understand it (or as I hope), there are just odd versions in the repository and switching to 1.5 was the very first done after releasing 1.4. So taking this commit and setting the version to 1.4.2 should be all I need?

Yes, normally the release version number is set in the release branch, so that is not tracked by the Git mirror ("upstream" branch - the equivalent of SVN Trunk).

Like I said, it is not ideal, you might be missing a few small commits. The Git mirror is primarily to track SVN Trunk.

Regards,
- Graeme -