Re: git push ERROR wrt. CI

Am 21.04.2022 um 09:56 schrieb Mark Thomas: On 20/04/2022 22:52, Rainer Jung wrote: I currently see ERROR messages when doing git push. The push itself seems to work and triggers eg. travis, but the error seems related with CI. Example: Enumerating objects: 5, done. Counting objects: 100% (

Re: git push ERROR wrt. CI

On 20/04/2022 22:52, Rainer Jung wrote: I currently see ERROR messages when doing git push. The push itself seems to work and triggers eg. travis, but the error seems related with CI. Example: Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 2 t

Re: git-fu is (still) weak

Hi Chris, On Tue, Apr 28, 2020 at 5:58 PM Christopher Schultz < ch...@christopherschultz.net> wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Coty, > > On 4/28/20 10:45, Coty Sutherland wrote: > > > > > > On Tue, Apr 28, 2020 at 10:21 AM Christopher Schultz > > >

Re: git-fu is (still) weak

On Tue, Apr 28, 2020 at 10:58 AM Christopher Schultz < ch...@christopherschultz.net> wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Coty, > > On 4/28/20 10:45, Coty Sutherland wrote: > > > > > > On Tue, Apr 28, 2020 at 10:21 AM Christopher Schultz > > >

Re: git-fu is (still) weak

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Coty, On 4/28/20 10:45, Coty Sutherland wrote: > > > On Tue, Apr 28, 2020 at 10:21 AM Christopher Schultz > > wrote: > > Rémy, > > On 4/27/20 18:41, Rémy Maucherat wrote: >> On Tue, Apr 28, 2020 at 12:21 AM Chri

Re: git-fu is (still) weak

On Tue, Apr 28, 2020 at 10:21 AM Christopher Schultz < ch...@christopherschultz.net> wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Rémy, > > On 4/27/20 18:41, Rémy Maucherat wrote: > > On Tue, Apr 28, 2020 at 12:21 AM Christopher Schultz > > >

Re: git-fu is (still) weak

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Rémy, On 4/27/20 18:41, Rémy Maucherat wrote: > On Tue, Apr 28, 2020 at 12:21 AM Christopher Schultz > > wrote: > > All, > > I tried again to commit to tc10 branch, got commit id > 8dddc11512fbd3b91ed9d737a42e4b

Re: git-fu is (still) weak

On Tue, Apr 28, 2020 at 12:21 AM Christopher Schultz < ch...@christopherschultz.net> wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > All, > > I tried again to commit to tc10 branch, got commit id > 8dddc11512fbd3b91ed9d737a42e4b8415458ddf. > > Moving to tc9 branch: > > $ git cherry-

Re: git-fu is (still) weak

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 All, I tried again to commit to tc10 branch, got commit id 8dddc11512fbd3b91ed9d737a42e4b8415458ddf. Moving to tc9 branch: $ git cherry-pick -n 8dddc11512fbd3b91ed9d737a42e4b8415458ddf fatal: bad object 8dddc11512fbd3b91ed9d737a42e4b8415458ddf -

Re: git-fu is weak

Am 2020-02-24 um 21:35 schrieb Christopher Schultz: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Michael, On 2/24/20 14:15, Michael Osipov wrote: Am 2020-02-24 um 17:33 schrieb Christopher Schultz: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 All, I'm trying to cherry-pick a commit. T

Re: git-fu is weak

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Michael, On 2/24/20 14:15, Michael Osipov wrote: > Am 2020-02-24 um 17:33 schrieb Christopher Schultz: >> -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 >> >> All, >> >> I'm trying to cherry-pick a commit. The commit went through >> github, merged

Re: git-fu is weak

Am 2020-02-24 um 17:33 schrieb Christopher Schultz: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 All, I'm trying to cherry-pick a commit. The commit went through github, merged a PR from a contributor into master. I'm trying to cherry-pick it back into the 9.0.x branch: $ git cherry-pick f1

Re: git-fu is weak

пн, 24 февр. 2020 г. в 19:40, Emmanuel Bourg : > > Le 24/02/2020 à 17:33, Christopher Schultz a écrit : > > > Any ideas? > > I guess you are cherry picking the merge commit, instead of the actual > commit(s) from the PR branch. > https://github.com/apache/tomcat/commit/f124a9c7230227d3eaff9d2dc1c5

Re: git-fu is weak

Le 24/02/2020 à 17:33, Christopher Schultz a écrit : > Any ideas? I guess you are cherry picking the merge commit, instead of the actual commit(s) from the PR branch. Emmanuel Bourg - To unsubscribe, e-mail: dev-unsubscr...@to

Re: Git repo for Tomcat Site

Mark, On 7/9/2019 1:45 AM, Mark Thomas wrote: On 09/07/2019 05:29, Igal Sapir wrote: Can we move the Tomcat site to Git? Yes. ASF infra supports both svnpubsub and gitpubsub for websites. There will need to be a little co-ordination with infra as we'd need to switch where the source for the si

Re: Git repo for Tomcat Site

On 09/07/2019 13:09, Violeta Georgieva wrote: > > > На вт, 9.07.2019 г. в 11:45 ч. Mark Thomas > написа: >> >> On 09/07/2019 05:29, Igal Sapir wrote: >> > Can we move the Tomcat site to Git? >> >> Yes. ASF infra supports both svnpubsub and gitpubsub for websites. There >

Re: Git repo for Tomcat Site

На вт, 9.07.2019 г. в 11:45 ч. Mark Thomas написа: > > On 09/07/2019 05:29, Igal Sapir wrote: > > Can we move the Tomcat site to Git? > > Yes. ASF infra supports both svnpubsub and gitpubsub for websites. There > will need to be a little co-ordination with infra as we'd need to switch > where the

Re: Git repo for Tomcat Site

On 09/07/2019 05:29, Igal Sapir wrote: > Can we move the Tomcat site to Git? Yes. ASF infra supports both svnpubsub and gitpubsub for websites. There will need to be a little co-ordination with infra as we'd need to switch where the source for the site is pulled from. On the plus side, Tomcat sit

Re: Git Migration: What is the svn:eol-style equilvalent?

On 05/03/2019 17:20, Igal Sapir wrote: > Coty, > > On Tue, Mar 5, 2019 at 6:23 AM Coty Sutherland wrote: > >> Hi, >> >> I updated the BUILDING and CONTRIBUTING documents so that GitHub users no >> longer see instructions for SVN after our migration, however I had a few >> questions. Does anyone

Re: Git Migration: What is the svn:eol-style equilvalent?

On 05/03/2019 14:23, Coty Sutherland wrote: > Hi, > > I updated the BUILDING and CONTRIBUTING documents so that GitHub users no > longer see instructions for SVN after our migration, however I had a few > questions. Does anyone know of a git equivalent to svn:eol-style that we > should be using? I

Re: Git Migration: What is the svn:eol-style equilvalent?

Coty, On Tue, Mar 5, 2019 at 6:23 AM Coty Sutherland wrote: > Hi, > > I updated the BUILDING and CONTRIBUTING documents so that GitHub users no > longer see instructions for SVN after our migration, however I had a few > questions. Does anyone know of a git equivalent to svn:eol-style that we >

Re: Git migration read for testing

Using an SSH remote URL has resolved the issue for me. Thank you. On Sat, Mar 2, 2019 at 1:35 PM Igal Sapir wrote: > On Wed, Feb 27, 2019 at 2:09 AM Mark Thomas wrote: > >> On 27/02/2019 09:44, Rémy Maucherat wrote: >> > On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: >> > >> >> All, >> >>

Re: Git migration read for testing

On Wed, Feb 27, 2019 at 2:09 AM Mark Thomas wrote: > On 27/02/2019 09:44, Rémy Maucherat wrote: > > On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: > > > >> All, > >> > >> https://github.com/apache/tomcat > > > > Trying my test commit, I can't push to the github repo. I probably missed > > so

Re: Git migration read for testing

Am 2019-03-01 um 21:50 schrieb Mark Thomas: On 01/03/2019 19:54, Mark Thomas wrote: On 01/03/2019 19:00, Coty Sutherland wrote: The email notifications work for when we push commits to the repository, but it looks like we're missing emails when PRs are opened. ACK. I'll talk to infra. Fixed

Re: Git migration read for testing

On 01/03/2019 20:58, Rémy Maucherat wrote: > On Fri, Mar 1, 2019 at 9:50 PM Mark Thomas wrote: > >> On 01/03/2019 19:54, Mark Thomas wrote: >>> On 01/03/2019 19:00, Coty Sutherland wrote: The email notifications work for when we push commits to the repository, but it looks like we're mi

Re: Git migration read for testing

On Fri, Mar 1, 2019 at 9:50 PM Mark Thomas wrote: > On 01/03/2019 19:54, Mark Thomas wrote: > > On 01/03/2019 19:00, Coty Sutherland wrote: > >> The email notifications work for when we push commits to the repository, > >> but it looks like we're missing emails when PRs are opened. > > > > ACK. I

Re: Git migration read for testing

On 01/03/2019 19:54, Mark Thomas wrote: > On 01/03/2019 19:00, Coty Sutherland wrote: >> The email notifications work for when we push commits to the repository, >> but it looks like we're missing emails when PRs are opened. > > ACK. I'll talk to infra. Fixed. FYI we have the option to route com

Re: Git migration read for testing

On 01/03/2019 19:00, Coty Sutherland wrote: > The email notifications work for when we push commits to the repository, > but it looks like we're missing emails when PRs are opened. ACK. I'll talk to infra. Mark > > On Wed, Feb 27, 2019 at 9:03 AM Rémy Maucherat wrote: > >> On Wed, Feb 27, 201

Re: Git migration read for testing

The email notifications work for when we push commits to the repository, but it looks like we're missing emails when PRs are opened. On Wed, Feb 27, 2019 at 9:03 AM Rémy Maucherat wrote: > On Wed, Feb 27, 2019 at 11:09 AM Mark Thomas wrote: > > > On 27/02/2019 09:44, Rémy Maucherat wrote: > > >

Re: Git migration read for testing

On Wed, Feb 27, 2019 at 11:09 AM Mark Thomas wrote: > On 27/02/2019 09:44, Rémy Maucherat wrote: > > On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: > > > >> All, > >> > >> https://github.com/apache/tomcat > > > > > > Trying my test commit, I can't push to the github repo. I probably missed >

Re: Git migration read for testing

On 27/02/2019 09:44, Rémy Maucherat wrote: > On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: > >> All, >> >> https://github.com/apache/tomcat > > > Trying my test commit, I can't push to the github repo. I probably missed > something obvious. You need to make sure you have three green ticks

Re: Git migration read for testing

On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: > All, > > https://github.com/apache/tomcat Trying my test commit, I can't push to the github repo. I probably missed something obvious. Rémy > > > is now ready for testing. > > It should contain: > branches > - master (9.0.x) > - 8.5.x > -

Re: Git migration read for testing

Konstantin, On Tue, Feb 26, 2019 at 4:23 PM Konstantin Kolinko wrote: > вт, 26 февр. 2019 г. в 21:24, Igal Sapir : > > > > Mark, > > > > On Tue, Feb 26, 2019 at 4:33 AM Mark Thomas wrote: > > > > > > > > branches > > > - master (9.0.x) > > > - 8.5.x > > > - 7.0.x > > > > What are the plans for

Re: Git migration read for testing

вт, 26 февр. 2019 г. в 21:24, Igal Sapir : > > Mark, > > On Tue, Feb 26, 2019 at 4:33 AM Mark Thomas wrote: > > > All, > > > > https://github.com/apache/tomcat > > > > is now ready for testing. > > > > It should contain: > > branches > > - master (9.0.x) > > - 8.5.x > > - 7.0.x > > > > What are th

Re: Git migration read for testing

On Tue, Feb 26, 2019 at 11:28 AM Mark Thomas wrote: > On 26/02/2019 18:23, Igal Sapir wrote: > > Mark, > > > > On Tue, Feb 26, 2019 at 4:33 AM Mark Thomas wrote: > > > >> All, > >> > >> https://github.com/apache/tomcat > >> > >> is now ready for testing. > >> > >> It should contain: > >> branche

Re: Git migration read for testing

On 26/02/2019 18:23, Igal Sapir wrote: > Mark, > > On Tue, Feb 26, 2019 at 4:33 AM Mark Thomas wrote: > >> All, >> >> https://github.com/apache/tomcat >> >> is now ready for testing. >> >> It should contain: >> branches >> - master (9.0.x) >> - 8.5.x >> - 7.0.x >> > > What are the plans for the

Re: Git migration read for testing

Mark, On Tue, Feb 26, 2019 at 4:33 AM Mark Thomas wrote: > All, > > https://github.com/apache/tomcat > > is now ready for testing. > > It should contain: > branches > - master (9.0.x) > - 8.5.x > - 7.0.x > What are the plans for the tomcat-site? I am working on the new site design and will soo

Re: Git migration read for testing

On Tue, Feb 26, 2019 at 6:45 AM Mark Thomas wrote: > On 26/02/2019 13:54, Rémy Maucherat wrote: > > On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: > > > >> All, > >> > >> https://github.com/apache/tomcat > >> > >> is now ready for testing. > >> > > > > That looks quite good :) > +1. Looks

Re: Git migration read for testing

On 26/02/2019 16:20, Mark Thomas wrote: > On 26/02/2019 15:25, Huxing Zhang wrote: >> Hi, >> >> It looks good to me. >> >> I think it is better to add some description and tags in the headline >> of Github, to make it more informative and searchable. >> >> For example: Apache Tomcat® is an open sou

Re: Git migration read for testing

Am 2019-02-26 um 13:33 schrieb Mark Thomas: All, https://github.com/apache/tomcat is now ready for testing. It should contain: branches - master (9.0.x) - 8.5.x - 7.0.x Tags: - one for each 7.0.x, 8.5.x and 9.0.x release Tags have all been renamed to follow a a.b.c-MODIFIERn format for versi

Re: Git migration read for testing

On 26/02/2019 15:25, Huxing Zhang wrote: > Hi, > > It looks good to me. > > I think it is better to add some description and tags in the headline > of Github, to make it more informative and searchable. > > For example: Apache Tomcat® is an open source implementation of the > Java Servlet, JavaS

Re: Git migration read for testing

Am 2019-02-26 um 14:54 schrieb Rémy Maucherat: On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: All, https://github.com/apache/tomcat is now ready for testing. It should contain: branches - master (9.0.x) - 8.5.x - 7.0.x Tags: - one for each 7.0.x, 8.5.x and 9.0.x release Tags have all

Re: Git migration read for testing

Hi, It looks good to me. I think it is better to add some description and tags in the headline of Github, to make it more informative and searchable. For example: Apache Tomcat® is an open source implementation of the Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket te

Re: Git migration read for testing

On 26/02/2019 13:54, Rémy Maucherat wrote: > On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: > >> All, >> >> https://github.com/apache/tomcat >> >> is now ready for testing. >> >> It should contain: >> branches >> - master (9.0.x) >> - 8.5.x >> - 7.0.x >> >> Tags: >> - one for each 7.0.x, 8.5.

Re: Git migration read for testing

On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: > All, > > https://github.com/apache/tomcat > > is now ready for testing. > > It should contain: > branches > - master (9.0.x) > - 8.5.x > - 7.0.x > > Tags: > - one for each 7.0.x, 8.5.x and 9.0.x release > > Tags have all been renamed to follow

Re: Git migration read for testing

On 26/02/2019 13:10, Mark Thomas wrote: > On 26/02/2019 12:45, Martin Grigorov wrote: >> All seems to work. >> I haven't received any email notifications though. > > I'll check where notifications are being sent. That should be fixed now. Mark

Re: Git migration read for testing

On 26/02/2019 12:45, Martin Grigorov wrote: > Hi, > > On Tue, Feb 26, 2019 at 2:33 PM Mark Thomas wrote: > >> All, >> >> https://github.com/apache/tomcat >> >> is now ready for testing. >> >> It should contain: >> branches >> - master (9.0.x) >> - 8.5.x >> - 7.0.x >> >> Tags: >> - one for each 7

Re: Git migration read for testing

Hi, On Tue, Feb 26, 2019 at 2:33 PM Mark Thomas wrote: > All, > > https://github.com/apache/tomcat > > is now ready for testing. > > It should contain: > branches > - master (9.0.x) > - 8.5.x > - 7.0.x > > Tags: > - one for each 7.0.x, 8.5.x and 9.0.x release > > Tags have all been renamed to fo

Re: Git migration: new branch/tag naming scheme

пн, 18 февр. 2019 г. в 11:08, Emmanuel Bourg > > Le 16/02/2019 à 16:09, Michael Osipov a écrit : > > > The given approach, for whatsoever reason, performs an uppercase and > > replaces dots with underscores. This reduces readability, but also > > requires people (esp. package maintainers) to perfo

Re: Git migration: new branch/tag naming scheme

Am 2019-02-20 um 17:44 schrieb Mark Thomas: On 20/02/2019 16:14, Igal Sapir wrote: Michael, On Mon, Feb 18, 2019 at 11:53 AM Michael Osipov wrote: Am 2019-02-18 um 15:19 schrieb Igal Sapir: I actually prefer "tc8.5" and "tc7.0" for the branches (over "8.5.x" and "7.0.x"). If tags will on

Re: Git migration: new branch/tag naming scheme

Mark, On 2/20/2019 8:44 AM, Mark Thomas wrote: On 20/02/2019 16:14, Igal Sapir wrote: Michael, On Mon, Feb 18, 2019 at 11:53 AM Michael Osipov wrote: Am 2019-02-18 um 15:19 schrieb Igal Sapir: I actually prefer "tc8.5" and "tc7.0" for the branches (over "8.5.x" and "7.0.x"). If tags wil

Re: Git migration: new branch/tag naming scheme

On 20/02/2019 16:14, Igal Sapir wrote: > Michael, > > On Mon, Feb 18, 2019 at 11:53 AM Michael Osipov wrote: > >> Am 2019-02-18 um 15:19 schrieb Igal Sapir: >>> >>> >>> I actually prefer "tc8.5" and "tc7.0" for the branches (over "8.5.x" and >>> "7.0.x"). If tags will only use the numeric vers

Re: Git migration: new branch/tag naming scheme

Michael, On Mon, Feb 18, 2019 at 11:53 AM Michael Osipov wrote: > Am 2019-02-18 um 15:19 schrieb Igal Sapir: > > > > > > I actually prefer "tc8.5" and "tc7.0" for the branches (over "8.5.x" and > > "7.0.x"). If tags will only use the numeric versions then this will make > > it easy to differen

Re: Git migration: new branch/tag naming scheme

Am 2019-02-18 um 15:19 schrieb Igal Sapir: On Mon, Feb 18, 2019 at 2:03 AM Mark Thomas wrote: On 18/02/2019 09:13, Rémy Maucherat wrote: On Sat, Feb 16, 2019 at 4:09 PM Michael Osipov wrote: Folks, given that we are currently in the process of migrating to Git I'd like to propose a more

Re: Git migration: new branch/tag naming scheme

Am 2019-02-18 um 11:03 schrieb Mark Thomas: On 18/02/2019 09:13, Rémy Maucherat wrote: On Sat, Feb 16, 2019 at 4:09 PM Michael Osipov wrote: Folks, given that we are currently in the process of migrating to Git I'd like to propose a more readible and with the branch names consistent tag nami

Re: Git migration: new branch/tag naming scheme

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Mark, On 2/18/19 05:03, Mark Thomas wrote: > On 18/02/2019 09:13, Rémy Maucherat wrote: >> On Sat, Feb 16, 2019 at 4:09 PM Michael Osipov >> wrote: >> >>> Folks, >>> >>> given that we are currently in the process of migrating to Git >>> I'd like

Re: Git migration: new branch/tag naming scheme

On Mon, Feb 18, 2019 at 2:03 AM Mark Thomas wrote: > On 18/02/2019 09:13, Rémy Maucherat wrote: > > On Sat, Feb 16, 2019 at 4:09 PM Michael Osipov > wrote: > > > >> Folks, > >> > >> given that we are currently in the process of migrating to Git I'd like > >> to propose a more readible and with t

Re: Git migration: new branch/tag naming scheme

On 18/02/2019 09:13, Rémy Maucherat wrote: > On Sat, Feb 16, 2019 at 4:09 PM Michael Osipov wrote: > >> Folks, >> >> given that we are currently in the process of migrating to Git I'd like >> to propose a more readible and with the branch names consistent tag >> naming scheme. >> >> The given app

Re: Git migration: new branch/tag naming scheme

On Sat, Feb 16, 2019 at 4:09 PM Michael Osipov wrote: > Folks, > > given that we are currently in the process of migrating to Git I'd like > to propose a more readible and with the branch names consistent tag > naming scheme. > > The given approach, for whatsoever reason, performs an uppercase an

Re: Git migration: new branch/tag naming scheme

Le 16/02/2019 à 16:09, Michael Osipov a écrit : > The given approach, for whatsoever reason, performs an uppercase and > replaces dots with underscores. This reduces readability, but also > requires people (esp. package maintainers) to perform sed(1) magic to > convert back and forth. I agree thi

Re: Git migration - Timing

On Mon, Feb 11, 2019 at 6:51 AM Mark Thomas 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 Sub

Re: Git migration: new branch/tag naming scheme

Michael, On Sat, Feb 16, 2019 at 7:09 AM Michael Osipov wrote: > > > There are bascially two approaches I'd like to discuss: > > Approch 1: It will reuse the branch name of the current major version, > excluding master. Thus, we will have the following prefixes: tomcat90-, > tomcat85-, and tomc

Re: Git migration - Timing

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 appro

Re: Git migration - Timing

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: >> htt

Re: Git migration - Timing

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

Re: Re: Git migration - Timing

> 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/confluen

Re: Git migration - Timing

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/TOMCA

Re: Git migration - Timing

> 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 repos

Re: [Git migration] Documentation

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Mark, On 8/27/18 16:42, Mark Thomas wrote: > We refer to svn in various places. Main web site, docs, > BUILDING.txt etc. > > The issue is when do we update the various docs. The main website > we can update whenever, but the version specific docs n

Re: [Git migration] Developer process

On 31/05/18 19:16, Igal Sapir wrote: > On 5/31/2018 3:00 AM, Mark Thomas wrote: >> Hi, >> >> The next issue to resolve for the Git migration is developer process. >> >> Note that this does not cover branch names, merge strategy etc. This is >> issue is about the options available for developers to

Re: [Git migration] Developer process

On 5/31/2018 3:00 AM, Mark Thomas wrote: Hi, The next issue to resolve for the Git migration is developer process. Note that this does not cover branch names, merge strategy etc. This is issue is about the options available for developers to organise their local development environment. The key

Re: [Git migration] Old git repositories

On Mon, May 21, 2018 at 3:57 PM, Mark Thomas wrote: > On 04/05/18 10:22, Konstantin Kolinko wrote: > > 2018-04-30 23:48 GMT+03:00 Mark Thomas : > >> The current plan is to merge all of the existing branches into a single > >> Git repo. This will be mirrored at GitHub under apache/tomcat. This is

Re: [Git migration] Old git repositories

On 04/05/18 10:22, Konstantin Kolinko wrote: > 2018-04-30 23:48 GMT+03:00 Mark Thomas : >> The current plan is to merge all of the existing branches into a single >> Git repo. This will be mirrored at GitHub under apache/tomcat. This is >> currently used for the svn mirror for trunk only. >> >> Thi

Re: [Git migration] Old git repositories

2018-04-30 23:48 GMT+03:00 Mark Thomas : > The current plan is to merge all of the existing branches into a single > Git repo. This will be mirrored at GitHub under apache/tomcat. This is > currently used for the svn mirror for trunk only. > > This raises the question what to do with: > apache/tomc

Re: [Git migration] Old git repositories

2018-04-30 16:48 GMT-04:00 Mark Thomas : > > The current plan is to merge all of the existing branches into a single > Git repo. This will be mirrored at GitHub under apache/tomcat. This is > currently used for the svn mirror for trunk only. > > This raises the question what to do with: > apache/to

Re: [Git migration] Old git repositories

+1 for deleting them. On Tue, May 1, 2018 at 5:36 AM, Coty Sutherland wrote: > On Mon, Apr 30, 2018, 16:48 Mark Thomas wrote: > >> The current plan is to merge all of the existing branches into a single >> Git repo. This will be mirrored at GitHub under apache/tomcat. This is >> currently used f

Re: [Git migration] Old git repositories

On Mon, Apr 30, 2018, 16:48 Mark Thomas wrote: > The current plan is to merge all of the existing branches into a single > Git repo. This will be mirrored at GitHub under apache/tomcat. This is > currently used for the svn mirror for trunk only. > > This raises the question what to do with: > apa

Re: [Git migration] Commit message format

On 09/04/18 09:26, Mark Thomas wrote: > On 21/03/18 13:00, Coty Sutherland wrote: >> On Tue, Mar 20, 2018 at 4:07 PM, Mark Thomas wrote: >>> Having seen some of the messages for the tomcat-training repo what are >>> people's thoughts? >> >> I have a couple small things. >> >> 1) The third block

Re: [Git migration] Commit message format

On 21/03/18 13:00, Coty Sutherland wrote: > On Tue, Mar 20, 2018 at 4:07 PM, Mark Thomas wrote: >> On 21/02/18 16:48, Mark Thomas wrote: >>> On 21/02/18 16:10, Rainer Jung wrote: Am 21.02.2018 um 16:53 schrieb Mark Thomas: > The next issue on the list is the format of commit messages. >>>

Re: [Git migration] Commit message format

On Tue, Mar 20, 2018 at 4:07 PM, Mark Thomas wrote: > On 21/02/18 16:48, Mark Thomas wrote: >> On 21/02/18 16:10, Rainer Jung wrote: >>> Am 21.02.2018 um 16:53 schrieb Mark Thomas: The next issue on the list is the format of commit messages. The commit messages we are seeing for the

Re: [Git migration] Commit message format

On 21/02/18 16:48, Mark Thomas wrote: > On 21/02/18 16:10, Rainer Jung wrote: >> Am 21.02.2018 um 16:53 schrieb Mark Thomas: >>> The next issue on the list is the format of commit messages. >>> >>> The commit messages we are seeing for the tomcat-training repository >>> have the same format as the

Re: [Git migration] Commit message format

On 21/02/18 16:10, Rainer Jung wrote: > Am 21.02.2018 um 16:53 schrieb Mark Thomas: >> The next issue on the list is the format of commit messages. >> >> The commit messages we are seeing for the tomcat-training repository >> have the same format as the commit message for the main tomcat repo will

Re: [Git migration] Commit message format

Am 21.02.2018 um 16:53 schrieb Mark Thomas: The next issue on the list is the format of commit messages. The commit messages we are seeing for the tomcat-training repository have the same format as the commit message for the main tomcat repo will have. Does anyone have any concerns regarding th

Re: [Git migration] Commit message format

On Wed, Feb 21, 2018 at 4:53 PM, Mark Thomas wrote: > The next issue on the list is the format of commit messages. > > The commit messages we are seeing for the tomcat-training repository > have the same format as the commit message for the main tomcat repo will > have. > > Does anyone have any c

Re: [Git migration] How to handle svn:external used by Tomcat Native

On 20/02/18 13:19, Emmanuel Bourg wrote: > Le 20/02/2018 à 13:42, Mark Thomas a écrit : > >> But they'd be in the source bundle. Isn't that sufficient to build off-line? > > Yes it is, and that's fine for Debian (Although currently the Debian > package doesn't use the source bundle but checks out

Re: [Git migration] How to handle svn:external used by Tomcat Native

Le 20/02/2018 à 13:42, Mark Thomas a écrit : > But they'd be in the source bundle. Isn't that sufficient to build off-line? Yes it is, and that's fine for Debian (Although currently the Debian package doesn't use the source bundle but checks out from SVN, but this can be changed). > I'm not clea

Re: [Git migration] How to handle svn:external used by Tomcat Native

On 20/02/18 07:42, Emmanuel Bourg wrote: > Le 14/02/2018 à 13:11, Rainer Jung a écrit : > >> I guess we would bundle the Java sources in any source distribution we >> provide. So only people wanting to do a release would need to run that >> "grab Java files from Tomcat" step. The step would be don

Re: [Git migration] How to handle svn:external used by Tomcat Native

Le 14/02/2018 à 13:11, Rainer Jung a écrit : > I guess we would bundle the Java sources in any source distribution we > provide. So only people wanting to do a release would need to run that > "grab Java files from Tomcat" step. The step would be done by the > release script. Copying the source f

Re: [Git migration] How to handle svn:external used by Tomcat Native

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Emmanuel, On 2/14/18 6:15 AM, Emmanuel Bourg wrote: > Le 12/02/2018 à 19:43, Christopher Schultz a écrit : > >> Is there also option 3) amend the build process to fetch the >> source from svn? > > This would be a bit inconvenient for Linux distrib

Re: Git repo for training content

On 15/02/18 16:09, Rémy Maucherat wrote: > On Thu, Feb 15, 2018 at 4:57 PM, Mark Thomas wrote: > >> Hi, >> >> Now the date and venue are fixed for the training course (I need to >> publish them) we need somewhere to put the training material. >> >> After some research my plan is to use reveal.js

Re: Git repo for training content

On Thu, Feb 15, 2018 at 4:57 PM, Mark Thomas wrote: > Hi, > > Now the date and venue are fixed for the training course (I need to > publish them) we need somewhere to put the training material. > > After some research my plan is to use reveal.js and GitHub pages. This > means we'll need a GitHib

Re: [Git migration] How to handle svn:external used by Tomcat Native

Le 11/02/2018 à 21:36, Mark Thomas a écrit : > Thoughts? comments? I'd like to suggest an alternative: what about packaging the Java part of tomcat-native into a jar (and potentially publishing it to Maven Central) and then adding it to the Tomcat dependencies? Emmanuel Bourg --

Re: [Git migration] How to handle svn:external used by Tomcat Native

Am 14.02.2018 um 12:15 schrieb Emmanuel Bourg: Le 12/02/2018 à 19:43, Christopher Schultz a écrit : Is there also option 3) amend the build process to fetch the source from svn? This would be a bit inconvenient for Linux distributions like Debian that build Tomcat in offline mode. I guess w

Re: [Git migration] How to handle svn:external used by Tomcat Native

Le 12/02/2018 à 19:43, Christopher Schultz a écrit : > Is there also option 3) amend the build process to fetch the source > from svn? This would be a bit inconvenient for Linux distributions like Debian that build Tomcat in offline mode. Emmanuel Bourg -

Re: [Git migration] How to handle svn:external used by Tomcat Native

Am 13.02.2018 um 11:56 schrieb Mark Thomas: On 12/02/18 18:43, Christopher Schultz wrote: Mark, On 2/11/18 3:36 PM, Mark Thomas wrote: Currently, Tomcat Native uses an svn:external to pull in the current Java source from trunk. With the switch to git, we'll need a different solution. Possib

Re: [Git migration] How to handle svn:external used by Tomcat Native

On 12/02/18 18:43, Christopher Schultz wrote: > Mark, > > On 2/11/18 3:36 PM, Mark Thomas wrote: >> Currently, Tomcat Native uses an svn:external to pull in the >> current Java source from trunk. With the switch to git, we'll need >> a different solution. > >> Possible options: > >> 1) Stop dist

Re: [Git migration] How to handle svn:external used by Tomcat Native

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Mark, On 2/11/18 3:36 PM, Mark Thomas wrote: > Currently, Tomcat Native uses an svn:external to pull in the > current Java source from trunk. With the switch to git, we'll need > a different solution. > > Possible options: > > 1) Stop distributing

Re: [Git migration] How to handle svn:external used by Tomcat Native

Am 11.02.2018 um 21:36 schrieb Mark Thomas: Currently, Tomcat Native uses an svn:external to pull in the current Java source from trunk. With the switch to git, we'll need a different solution. Possible options: 1) Stop distributing Java elements of Tomcat Native in the Tomcat Native releas

Re: [Git migration] CI systems

On 05/02/18 10:23, Mark Thomas wrote: > We'll need to update the CI systems (Gump, BuildBot) to work off git > rather than svn. Both support this so this should be fairly simple. > > My proposed plan is that we leave the CI systems pointing at svn to > start with, migrate to a single git repo as d

Re: [Git migration] Merge strategy

Thanks for all the input. Consensus appears to be for cherry-picking so I'll update the wiki page accordingly and move onto the next question. Mark On 22/01/18 21:16, Mark Thomas wrote: > The plan when we migrate to git is to migrate to single git repo with > the following branches: > > master

  1   2   >