Re: Git migration: new branch/tag naming scheme

2019-02-25 Thread Konstantin Kolinko
пн, 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

2019-02-20 Thread Michael Osipov
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

2019-02-20 Thread Igal Sapir
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

2019-02-20 Thread 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 only use the numeric vers

Re: Git migration: new branch/tag naming scheme

2019-02-20 Thread Igal Sapir
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

2019-02-18 Thread Michael Osipov
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

2019-02-18 Thread Michael Osipov
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

2019-02-18 Thread Christopher Schultz
-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

2019-02-18 Thread 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 readible and with t

Re: Git migration: new branch/tag naming scheme

2019-02-18 Thread 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 >> naming scheme. >> >> The given app

Re: Git migration: new branch/tag naming scheme

2019-02-18 Thread Rémy Maucherat
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

2019-02-18 Thread 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 perform sed(1) magic to > convert back and forth. I agree thi

Re: Git migration: new branch/tag naming scheme

2019-02-17 Thread Igal Sapir
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

Git migration: new branch/tag naming scheme

2019-02-16 Thread Michael Osipov
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 and replaces dots with underscores. This reduces readability, but

Re: New branch ?

2007-05-21 Thread Remy Maucherat
Yoav Shapira wrote: Hi, > Yes, it could maybe be the cleanest, but too annoying to do IMO. I > would prefer the easy way you suggested and move current development > to http://svn.apache.org/repos/asf/tomcat/trunk/ until there's a > release plan and it is moved to a /tcy.y.x/trunk/ with the app

Re: New branch ?

2007-05-21 Thread Yoav Shapira
Hi, > Yes, it could maybe be the cleanest, but too annoying to do IMO. I > would prefer the easy way you suggested and move current development > to http://svn.apache.org/repos/asf/tomcat/trunk/ until there's a > release plan and it is moved to a /tcy.y.x/trunk/ with the appropriate > name. I

Re: New branch ?

2007-05-21 Thread Filip Hanik - Dev Lists
Remy Maucherat wrote: Rainer Jung wrote: Hi, I think Yoav might have misunderstood your suggestion. I interprete the branch you posted as the one, you suggest to use for the maintenance of the existing 6.0.x source and to use trunk to proceed with working on annotations, comet etc. What I

Re: New branch ?

2007-05-18 Thread Remy Maucherat
Rainer Jung wrote: Hi, I think Yoav might have misunderstood your suggestion. I interprete the branch you posted as the one, you suggest to use for the maintenance of the existing 6.0.x source and to use trunk to proceed with working on annotations, comet etc. What I would find a little str

Re: New branch ?

2007-05-18 Thread Rainer Jung
Hi, I think Yoav might have misunderstood your suggestion. I interprete the branch you posted as the one, you suggest to use for the maintenance of the existing 6.0.x source and to use trunk to proceed with working on annotations, comet etc. What I would find a little strange, would be using

Re: New branch ?

2007-05-18 Thread Remy Maucherat
Yoav Shapira wrote: Hola, On 5/18/07, Remy Maucherat <[EMAIL PROTECTED]> wrote: http(s)://svn.apache.org/repos/asf/tomcat/tc6.0.x/branches/tc6.0.x ? Or http(s)://svn.apache.org/repos/asf/tomcat/tc6.0.x/branches/annotationsAndComet If it gets that experimental, it should go to the sandbox

Re: New branch ?

2007-05-18 Thread Yoav Shapira
Hola, On 5/18/07, Remy Maucherat <[EMAIL PROTECTED]> wrote: http(s)://svn.apache.org/repos/asf/tomcat/tc6.0.x/branches/tc6.0.x ? Or http(s)://svn.apache.org/repos/asf/tomcat/tc6.0.x/branches/annotationsAndComet Yoav - To un

Re: New branch ?

2007-05-18 Thread Remy Maucherat
Remy Maucherat wrote: Hi, Because of the amount of proposed API changes, it could be a good idea to start a new 6.x branch (with a short release cycle). Or is it acceptable to do these in 6.0.x ? The list would be: - new Comet capabilities, with non blocking IO - revised EE integration APIs

Re: New branch ?

2007-05-17 Thread Jim Jagielski
On May 17, 2007, at 7:46 AM, Remy Maucherat wrote: Hi, Because of the amount of proposed API changes, it could be a good idea to start a new 6.x branch (with a short release cycle). Or is it acceptable to do these in 6.0.x ? The list would be: - new Comet capabilities, with non blocking

Re: New branch ?

2007-05-17 Thread Filip Hanik - Dev Lists
Yoav Shapira wrote: Hi, On 5/17/07, Henri Gomez <[EMAIL PROTECTED]> wrote: > we're calling the existing one 6.0.x, > wouldn't it be reasonable to call the new one 6.1.x? 6.1 or 6.5 ? Like 5.0 and 5.5 :) Exactly my point -- the version number is not something we need to decide now ;) The bra

Re: New branch ?

2007-05-17 Thread Yoav Shapira
Hi, On 5/17/07, Henri Gomez <[EMAIL PROTECTED]> wrote: > we're calling the existing one 6.0.x, > wouldn't it be reasonable to call the new one 6.1.x? 6.1 or 6.5 ? Like 5.0 and 5.5 :) Exactly my point -- the version number is not something we need to decide now ;) The branch can be named for

Re: New branch ?

2007-05-17 Thread Henri Gomez
we're calling the existing one 6.0.x, wouldn't it be reasonable to call the new one 6.1.x? 6.1 or 6.5 ? Like 5.0 and 5.5 :) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]

Re: New branch ?

2007-05-17 Thread Filip Hanik - Dev Lists
Yoav Shapira wrote: Hi, On 5/17/07, Remy Maucherat <[EMAIL PROTECTED]> wrote: Because of the amount of proposed API changes, it could be a good idea to start a new 6.x branch (with a short release cycle). Or is it acceptable to do these in 6.0.x ? Like Filip and Mladen, I would prefer

Re: New branch ?

2007-05-17 Thread Remy Maucherat
Jean-Frederic wrote: On Thu, 2007-05-17 at 13:46 +0200, Remy Maucherat wrote: Hi, Because of the amount of proposed API changes, it could be a good idea to start a new 6.x branch (with a short release cycle). Or is it acceptable to do these in 6.0.x ? If you make a new branch I think the

Re: New branch ?

2007-05-17 Thread Jean-Frederic
On Thu, 2007-05-17 at 13:46 +0200, Remy Maucherat wrote: > Hi, > > Because of the amount of proposed API changes, it could be a good idea > to start a new 6.x branch (with a short release cycle). Or is it > acceptable to do these in 6.0.x ? If you make a new branch I think the

Re: New branch ?

2007-05-17 Thread Yoav Shapira
Hi, On 5/17/07, Remy Maucherat <[EMAIL PROTECTED]> wrote: Because of the amount of proposed API changes, it could be a good idea to start a new 6.x branch (with a short release cycle). Or is it acceptable to do these in 6.0.x ? Like Filip and Mladen, I would prefer a new branch. It&#x

Re: New branch ?

2007-05-17 Thread Mladen Turk
Filip Hanik - Dev Lists wrote: +1 Sure, I'd prefer the new branch, it's a good idea in the scenario where the new changes may not be complete and we have to do a security fix/release 6.0 But then 6.0 should be frozen for any API change. 6.1.x would work If the 6.2 stable b

Re: New branch ?

2007-05-17 Thread Filip Hanik - Dev Lists
+1 Sure, I'd prefer the new branch, it's a good idea in the scenario where the new changes may not be complete and we have to do a security fix/release 6.0 6.1.x would work Filip Remy Maucherat wrote: Hi, Because of the amount of proposed API changes, it could be a good idea

New branch ?

2007-05-17 Thread Remy Maucherat
Hi, Because of the amount of proposed API changes, it could be a good idea to start a new 6.x branch (with a short release cycle). Or is it acceptable to do these in 6.0.x ? The list would be: - new Comet capabilities, with non blocking IO - revised EE integration APIs (for annotation process