Git migration - Timing

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

Git migration - Timing

Mark Thomas-2
All,

I'd like to propose that we make the move from svn to git for Tomcat
7.0.x, 8.5.x and 9.0.x as soon as the next 7.0.x release is complete.

The proposed approach is documented here:
https://cwiki.apache.org/confluence/display/TOMCAT/Git+migration

I anticipate that the repositories will be read only for a couple of hours.

I also anticipate that the CI systems - particularly Gump - will take up
to a day to switch over and iron out any problems.

Any objections?

If not, I'll start a formal VOTE.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Git migration - Timing

Michael Osipov-3
> All,
>
> I'd like to propose that we make the move from svn to git for Tomcat
> 7.0.x, 8.5.x and 9.0.x as soon as the next 7.0.x release is complete.
>
> The proposed approach is documented here:
> https://cwiki.apache.org/confluence/display/TOMCAT/Git+migration
>
> I anticipate that the repositories will be read only for a couple of hours.
>
> I also anticipate that the CI systems - particularly Gump - will take up
> to a day to switch over and iron out any problems.
>
> Any objections?
>
> If not, I'll start a formal VOTE.

Can you leave me a few more days? I'd like to review the wiki page and add some propsals.

Michael

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Git migration - Timing

Mark Thomas-2
On 11/02/2019 19:57, Michael Osipov wrote:

>> All,
>>
>> I'd like to propose that we make the move from svn to git for Tomcat
>> 7.0.x, 8.5.x and 9.0.x as soon as the next 7.0.x release is complete.
>>
>> The proposed approach is documented here:
>> https://cwiki.apache.org/confluence/display/TOMCAT/Git+migration
>>
>> I anticipate that the repositories will be read only for a couple of hours.
>>
>> I also anticipate that the CI systems - particularly Gump - will take up
>> to a day to switch over and iron out any problems.
>>
>> Any objections?
>>
>> If not, I'll start a formal VOTE.
>
> Can you leave me a few more days? I'd like to review the wiki page and add some propsals.

What sort of proposals?

Each of the issues has been discussed and the approach agreed within the
community - on this list - over a period of many months.

Unless there is a show-stopper issue that has been missed in the
discussions to date, I really do think it is time to move forward with
the actual migration.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Re: Git migration - Timing

Michael Osipov-3
> On 11/02/2019 19:57, Michael Osipov wrote:
> >> All,
> >>
> >> I'd like to propose that we make the move from svn to git for Tomcat
> >> 7.0.x, 8.5.x and 9.0.x as soon as the next 7.0.x release is complete.
> >>
> >> The proposed approach is documented here:
> >> https://cwiki.apache.org/confluence/display/TOMCAT/Git+migration
> >>
> >> I anticipate that the repositories will be read only for a couple of hours.
> >>
> >> I also anticipate that the CI systems - particularly Gump - will take up
> >> to a day to switch over and iron out any problems.
> >>
> >> Any objections?
> >>
> >> If not, I'll start a formal VOTE.
> >
> > Can you leave me a few more days? I'd like to review the wiki page and add some propsals.
>
> What sort of proposals?
>
> Each of the issues has been discussed and the approach agreed within the
> community - on this list - over a period of many months.
>
> Unless there is a show-stopper issue that has been missed in the
> discussions to date, I really do think it is time to move forward with
> the actual migration.

I completely missed that discussion, truly my fault.
It maybe nothing special I'd object or maybe nothing at all.
At Maven TLP we have migrated tens of repos, so we gained some experience here.

Michael

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Git migration - Timing

Michael Osipov
In reply to this post by Mark Thomas-2
Am 2019-02-11 um 15:51 schrieb Mark Thomas:

> All,
>
> I'd like to propose that we make the move from svn to git for Tomcat
> 7.0.x, 8.5.x and 9.0.x as soon as the next 7.0.x release is complete.
>
> The proposed approach is documented here:
> https://cwiki.apache.org/confluence/display/TOMCAT/Git+migration
>
> I anticipate that the repositories will be read only for a couple of hours.
>
> I also anticipate that the CI systems - particularly Gump - will take up
> to a day to switch over and iron out any problems.
>
> Any objections?

Hi Mark,

thanks for bearing with me. I was now finally able to look at the
proposal. As far as I understand there wil be a single repo for the
entire code base and everything will happen in branches.

Here are my comments:

1. You have set up branches: master, tomcat70, tomcat85, etc, but the
document talks about "Branch names. master, tc8.5, tc8.0, tc7.0 etc"
that seems to be inconsistent.
2. What will happens with Tomcat JDBC Pool? Will in remain in the
Subversion repo or will it move to tomcat-jdbc-pool.git? The code does
not change that offen that justifies a tandem release with Tomcat.
3. Why do you bother to import Tomcat 8.0? It is EOL, leave it in
Subversion. Do you plan to perform any futher merge here?
4. Can we *please* have a readible tag name scheme?! I simply don't
understand why people uppercase everything and replace dots with
underscores. That's just ugly. Consistent tag names would be
"{branch-name}-{version}" for the mono repo. E.g, tomcat85-8.5.40, or
tomcat70-7.0.95. This would heavily reduce sed(1) magic for package
maintainers and improve readability.
5. I assume that mod_jk, native and friends will remain in the
Subversion repo?
6. I don't see in the wiki page an agreement on a good/wellknown Git
commit message scheme: "BZ #123: <title>\n\n<optional message>"

Regards,

Michael

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Git migration - Timing

Mark Thomas-2
On 16/02/2019 13:39, Michael Osipov wrote:

> Am 2019-02-11 um 15:51 schrieb Mark Thomas:
>> All,
>>
>> I'd like to propose that we make the move from svn to git for Tomcat
>> 7.0.x, 8.5.x and 9.0.x as soon as the next 7.0.x release is complete.
>>
>> The proposed approach is documented here:
>> https://cwiki.apache.org/confluence/display/TOMCAT/Git+migration
>>
>> I anticipate that the repositories will be read only for a couple of
>> hours.
>>
>> I also anticipate that the CI systems - particularly Gump - will take up
>> to a day to switch over and iron out any problems.
>>
>> Any objections?
>
> Hi Mark,
>
> thanks for bearing with me. I was now finally able to look at the
> proposal. As far as I understand there wil be a single repo for the
> entire code base and everything will happen in branches.
>
> Here are my comments:
>
> 1. You have set up branches: master, tomcat70, tomcat85, etc, but the
> document talks about "Branch names. master, tc8.5, tc8.0, tc7.0 etc"
> that seems to be inconsistent.

The demo was set up before the branch names were agreed.

> 2. What will happens with Tomcat JDBC Pool? Will in remain in the
> Subversion repo or will it move to tomcat-jdbc-pool.git? The code does
> not change that offen that justifies a tandem release with Tomcat.

It will remain part of the repo for each Tomcat version - as it is now.

> 3. Why do you bother to import Tomcat 8.0? It is EOL, leave it in
> Subversion. Do you plan to perform any futher merge here?

The demo was set up before 8.0.x was made EOL. There are no plans to
move 8.0.c to git.

> 4. Can we *please* have a readible tag name scheme?! I simply don't
> understand why people uppercase everything and replace dots with
> underscores. That's just ugly. Consistent tag names would be
> "{branch-name}-{version}" for the mono repo. E.g, tomcat85-8.5.40, or
> tomcat70-7.0.95. This would heavily reduce sed(1) magic for package
> maintainers and improve readability.

The community has not expressed a desire to change the naming scheme.
You are, of course, free to start such a discussion on dev@.

> 5. I assume that mod_jk, native and friends will remain in the
> Subversion repo?

Yes.

> 6. I don't see in the wiki page an agreement on a good/wellknown Git
> commit message scheme: "BZ #123: <title>\n\n<optional message>"

No such convention exists for subversion. The community has not
expressed a desire to introduce one with the move to git. Again, you are
free to start a discussion on dev@

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Git migration - Timing

Michael Osipov
Am 2019-02-16 um 14:46 schrieb Mark Thomas:

> On 16/02/2019 13:39, Michael Osipov wrote:
>> Am 2019-02-11 um 15:51 schrieb Mark Thomas:
>>> All,
>>>
>>> I'd like to propose that we make the move from svn to git for Tomcat
>>> 7.0.x, 8.5.x and 9.0.x as soon as the next 7.0.x release is complete.
>>>
>>> The proposed approach is documented here:
>>> https://cwiki.apache.org/confluence/display/TOMCAT/Git+migration
>>>
>>> I anticipate that the repositories will be read only for a couple of
>>> hours.
>>>
>>> I also anticipate that the CI systems - particularly Gump - will take up
>>> to a day to switch over and iron out any problems.
>>>
>>> Any objections?
>>
>> Hi Mark,
>>
>> thanks for bearing with me. I was now finally able to look at the
>> proposal. As far as I understand there wil be a single repo for the
>> entire code base and everything will happen in branches.
>>
>> Here are my comments:
>>
>> 1. You have set up branches: master, tomcat70, tomcat85, etc, but the
>> document talks about "Branch names. master, tc8.5, tc8.0, tc7.0 etc"
>> that seems to be inconsistent.
>
> The demo was set up before the branch names were agreed.
>
>> 2. What will happens with Tomcat JDBC Pool? Will in remain in the
>> Subversion repo or will it move to tomcat-jdbc-pool.git? The code does
>> not change that offen that justifies a tandem release with Tomcat.
>
> It will remain part of the repo for each Tomcat version - as it is now.
>
>> 3. Why do you bother to import Tomcat 8.0? It is EOL, leave it in
>> Subversion. Do you plan to perform any futher merge here?
>
> The demo was set up before 8.0.x was made EOL. There are no plans to
> move 8.0.c to git.
>
>> 4. Can we *please* have a readible tag name scheme?! I simply don't
>> understand why people uppercase everything and replace dots with
>> underscores. That's just ugly. Consistent tag names would be
>> "{branch-name}-{version}" for the mono repo. E.g, tomcat85-8.5.40, or
>> tomcat70-7.0.95. This would heavily reduce sed(1) magic for package
>> maintainers and improve readability.
>
> The community has not expressed a desire to change the naming scheme.
> You are, of course, free to start such a discussion on dev@.
>
>> 5. I assume that mod_jk, native and friends will remain in the
>> Subversion repo?
>
> Yes.
>
>> 6. I don't see in the wiki page an agreement on a good/wellknown Git
>> commit message scheme: "BZ #123: <title>\n\n<optional message>"
>
> No such convention exists for subversion. The community has not
> expressed a desire to introduce one with the move to git. Again, you are
> free to start a discussion on dev@

Thanks for the quick response. I will start the approapriate discussions!

Michael

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Git migration - Timing

Igal Sapir
In reply to this post by Mark Thomas-2
On Mon, Feb 11, 2019 at 6:51 AM Mark Thomas <[hidden email]> wrote:

> All,
>
> I'd like to propose that we make the move from svn to git for Tomcat
> 7.0.x, 8.5.x and 9.0.x as soon as the next 7.0.x release is complete.
>

This is very exciting.  I have been using Git for some time now, and only
started using Subversion with the Tomcat project, and found it to be rather
difficult to use in comparison.  I was also locked out of the Apache
networks at some point when I tried to download the whole SVN repo.

Incidentally, I was traveling last week (@Remy, you have a beautiful
country) and my primary reading material for the long flights was about
Subversion.  I'm quite happy that I won't need to put my newly acquired
knowledge to use.

What about the "site" branch?  I don't see it mentioned anywhere and I
think that it's important to migrate it to Git as well.

Best,

Igal



> The proposed approach is documented here:
> https://cwiki.apache.org/confluence/display/TOMCAT/Git+migration
>
> I anticipate that the repositories will be read only for a couple of hours.
>
> I also anticipate that the CI systems - particularly Gump - will take up
> to a day to switch over and iron out any problems.
>
> Any objections?
>
> If not, I'll start a formal VOTE.
>
> Mark
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>