Re: [DISCUSS] Rename default branch to `main`
That looks great. Good call to archive and remove some of those repositories. On Wed, Sep 16, 2020 at 11:52 AM Paul Davis wrote: > > I'll create the branches on all of the appropriate repositories today > and start looking at Jenkins requirements. I'll hold off on filing the > infra ticket until tomorrow so that folks have time to double check my > sanity. > > On Wed, Sep 16, 2020 at 10:50 AM Paul Davis > wrote: > > > > Also, I added an easier to digest list of repositories with their > > planned actions to the gist [1]. I'm repasting here for historical > > tracing. > > > > Create `main` branch, update default branch and branch protections > > === > > > > * couchdb > > * couchdb-admin > > * couchdb-b64url > > * couchdb-bear > > * couchdb-ci > > * couchdb-config > > * couchdb-docker > > * couchdb-documentation > > * couchdb-erlfdb > > * couchdb-escodegen > > * couchdb-esprima > > * couchdb-ets-lru > > * couchdb-fauxton > > * couchdb-folsom > > * couchdb-glazier > > * couchdb-helm > > * couchdb-hqueue > > * couchdb-hyper > > * couchdb-ibrowse > > * couchdb-ioq > > * couchdb-jaeger-passage > > * couchdb-jiffy > > * couchdb-khash > > * couchdb-local > > * couchdb-meck > > * couchdb-mochiweb > > * couchdb-nano > > * couchdb-passage > > * couchdb-pkg > > * couchdb-rebar > > * couchdb-recon > > * couchdb-snappy > > * couchdb-thrift-protocol > > > > Have infra set `asf-site` as default branch > > === > > > > * couchdb-www > > > > Empty repositories to delete > > === > > > > * couchdb-fauxton-server > > * couchdb-javascript-tests > > * couchdb-query-server-spidermonkey > > > > Repositories to archive > > === > > > > * couchdb-cassim > > * couchdb-chttpd > > * couchdb-couch > > * couchdb-couch-collate > > * couchdb-couch-dbupdates > > * couchdb-couch-epi > > * couchdb-couch-event > > * couchdb-couch-httpd > > * couchdb-couch-index > > * couchdb-couch-log > > * couchdb-couch-log-lager > > * couchdb-couch-mrview > > * couchdb-couch-plugins > > * couchdb-couch-replicator > > * couchdb-couch-stats > > * couchdb-ddoc-cache > > * couchdb-erlang-bcrypt > > * couchdb-erlang-tests > > * couchdb-examples > > * couchdb-fabric > > * couchdb-futon > > * couchdb-global-changes > > * couchdb-goldrush > > * couchdb-jquery-couch > > * couchdb-lager > > * couchdb-mango > > * couchdb-mem3 > > * couchdb-nmo > > * couchdb-oauth > > * couchdb-peruser > > * couchdb-query-server-node > > * couchdb-rexi > > * couchdb-setup > > * couchdb-smoosh > > * couchdb-triq > > * couchdb-twig > > > > > > [1] https://gist.github.com/davisp/9de8fa167812f80356d4990e390c9351 > > > > On Wed, Sep 16, 2020 at 10:49 AM Paul Davis > > wrote: > > > > > > Right. I figure that's basically an ASF version of the `gh-pages` branch? > > > > > > On Wed, Sep 16, 2020 at 10:39 AM Joan Touzet wrote: > > > > > > > > > > > > On 16/09/2020 11:39, Paul Davis wrote: > > > > > On Wed, Sep 16, 2020 at 10:32 AM Joan Touzet > > > > > wrote: > > > > >> > > > > >> > > > > >> > > > > >> On 16/09/2020 10:57, Paul Davis wrote: > > > > >>> Hey all, > > > > >>> > > > > >>> Here's a list of all CouchDB related repositories with a few quick > > > > >>> stats and my read on their status and requirements. Can I get some > > > > >>> eyeballs on this to double check before I submit a ticket to infra > > > > >>> for doing our branch renaming updates? > > > > >>> > > > > >>> https://gist.github.com/davisp/9de8fa167812f80356d4990e390c9351 > > > > >>> > > > > >>> There are a few repos with comments I had when I wasn't 100% sure on > > > > >>> the status. For ease those are: > > > > >>> > > > > >>> couchdb-couch-collate - I couldn't easily tell if this was still > > > > >>> used for Windows builds > > > > >> > > > > >> Nope > > > > >> > > > > >>> couchdb-fauxton-server - This is an empty repo, should we have it > > > > >>> deleted? > > > > >> > > > > >> Sure > > > > >> > > > > >>> couchdb-jquery-couch - Should this be archived? Has PouchDB/nano > > > > >>> replaced it? > > > > >> > > > > >> If I recall correctly this was part of Futon and 1.x releases? > > > > >> > > > > >>> couchdb-nmo - Should this be archived? > > > > >> > > > > >> Very old code from 2015 from Robert Kowalski to help set up > > > > >> clusters/etc. I don't know anything about it, and it appears > > > > >> unmaintained. +1 to archive > > > > >> > > > > >>> couchdb-oauth - I couldn't find this used anywhere, should we > > > > >>> archive > > > > >> > > > > >> I remember using this extensively! 1.x asset. As we no longer > > > > >> officially > > > > >> support it (or CouchDB "plugins" in this form), +1 to archive > > > > >> > > > > >>> couchdb-www - Should this be archived or included in the rename? > > > > >> > > > > >> We already
Re: [DISCUSS] Rename default branch to `main`
I'll create the branches on all of the appropriate repositories today and start looking at Jenkins requirements. I'll hold off on filing the infra ticket until tomorrow so that folks have time to double check my sanity. On Wed, Sep 16, 2020 at 10:50 AM Paul Davis wrote: > > Also, I added an easier to digest list of repositories with their > planned actions to the gist [1]. I'm repasting here for historical > tracing. > > Create `main` branch, update default branch and branch protections > === > > * couchdb > * couchdb-admin > * couchdb-b64url > * couchdb-bear > * couchdb-ci > * couchdb-config > * couchdb-docker > * couchdb-documentation > * couchdb-erlfdb > * couchdb-escodegen > * couchdb-esprima > * couchdb-ets-lru > * couchdb-fauxton > * couchdb-folsom > * couchdb-glazier > * couchdb-helm > * couchdb-hqueue > * couchdb-hyper > * couchdb-ibrowse > * couchdb-ioq > * couchdb-jaeger-passage > * couchdb-jiffy > * couchdb-khash > * couchdb-local > * couchdb-meck > * couchdb-mochiweb > * couchdb-nano > * couchdb-passage > * couchdb-pkg > * couchdb-rebar > * couchdb-recon > * couchdb-snappy > * couchdb-thrift-protocol > > Have infra set `asf-site` as default branch > === > > * couchdb-www > > Empty repositories to delete > === > > * couchdb-fauxton-server > * couchdb-javascript-tests > * couchdb-query-server-spidermonkey > > Repositories to archive > === > > * couchdb-cassim > * couchdb-chttpd > * couchdb-couch > * couchdb-couch-collate > * couchdb-couch-dbupdates > * couchdb-couch-epi > * couchdb-couch-event > * couchdb-couch-httpd > * couchdb-couch-index > * couchdb-couch-log > * couchdb-couch-log-lager > * couchdb-couch-mrview > * couchdb-couch-plugins > * couchdb-couch-replicator > * couchdb-couch-stats > * couchdb-ddoc-cache > * couchdb-erlang-bcrypt > * couchdb-erlang-tests > * couchdb-examples > * couchdb-fabric > * couchdb-futon > * couchdb-global-changes > * couchdb-goldrush > * couchdb-jquery-couch > * couchdb-lager > * couchdb-mango > * couchdb-mem3 > * couchdb-nmo > * couchdb-oauth > * couchdb-peruser > * couchdb-query-server-node > * couchdb-rexi > * couchdb-setup > * couchdb-smoosh > * couchdb-triq > * couchdb-twig > > > [1] https://gist.github.com/davisp/9de8fa167812f80356d4990e390c9351 > > On Wed, Sep 16, 2020 at 10:49 AM Paul Davis > wrote: > > > > Right. I figure that's basically an ASF version of the `gh-pages` branch? > > > > On Wed, Sep 16, 2020 at 10:39 AM Joan Touzet wrote: > > > > > > > > > On 16/09/2020 11:39, Paul Davis wrote: > > > > On Wed, Sep 16, 2020 at 10:32 AM Joan Touzet wrote: > > > >> > > > >> > > > >> > > > >> On 16/09/2020 10:57, Paul Davis wrote: > > > >>> Hey all, > > > >>> > > > >>> Here's a list of all CouchDB related repositories with a few quick > > > >>> stats and my read on their status and requirements. Can I get some > > > >>> eyeballs on this to double check before I submit a ticket to infra > > > >>> for doing our branch renaming updates? > > > >>> > > > >>> https://gist.github.com/davisp/9de8fa167812f80356d4990e390c9351 > > > >>> > > > >>> There are a few repos with comments I had when I wasn't 100% sure on > > > >>> the status. For ease those are: > > > >>> > > > >>> couchdb-couch-collate - I couldn't easily tell if this was still > > > >>> used for Windows builds > > > >> > > > >> Nope > > > >> > > > >>> couchdb-fauxton-server - This is an empty repo, should we have it > > > >>> deleted? > > > >> > > > >> Sure > > > >> > > > >>> couchdb-jquery-couch - Should this be archived? Has PouchDB/nano > > > >>> replaced it? > > > >> > > > >> If I recall correctly this was part of Futon and 1.x releases? > > > >> > > > >>> couchdb-nmo - Should this be archived? > > > >> > > > >> Very old code from 2015 from Robert Kowalski to help set up > > > >> clusters/etc. I don't know anything about it, and it appears > > > >> unmaintained. +1 to archive > > > >> > > > >>> couchdb-oauth - I couldn't find this used anywhere, should we archive > > > >> > > > >> I remember using this extensively! 1.x asset. As we no longer > > > >> officially > > > >> support it (or CouchDB "plugins" in this form), +1 to archive > > > >> > > > >>> couchdb-www - Should this be archived or included in the rename? > > > >> > > > >> We already have to use asf-site branch on this, and the 'master' branch > > > >> already says "you're on the wrong branch." Just have Infra change the > > > >> default branch to asf-site, no need to master -> main here IMO. > > > >> > > > > > > > > Want me to have infra change the default branch to `asf-site` on this > > > > repo? > > > > > > Yes please! No need to change to main here. > > > > > > -Joan > > > > > > > > > > > Everything else sounds good. > > > > > > > >>> > > > >>>
Re: [DISCUSS] Rename default branch to `main`
Also, I added an easier to digest list of repositories with their planned actions to the gist [1]. I'm repasting here for historical tracing. Create `main` branch, update default branch and branch protections === * couchdb * couchdb-admin * couchdb-b64url * couchdb-bear * couchdb-ci * couchdb-config * couchdb-docker * couchdb-documentation * couchdb-erlfdb * couchdb-escodegen * couchdb-esprima * couchdb-ets-lru * couchdb-fauxton * couchdb-folsom * couchdb-glazier * couchdb-helm * couchdb-hqueue * couchdb-hyper * couchdb-ibrowse * couchdb-ioq * couchdb-jaeger-passage * couchdb-jiffy * couchdb-khash * couchdb-local * couchdb-meck * couchdb-mochiweb * couchdb-nano * couchdb-passage * couchdb-pkg * couchdb-rebar * couchdb-recon * couchdb-snappy * couchdb-thrift-protocol Have infra set `asf-site` as default branch === * couchdb-www Empty repositories to delete === * couchdb-fauxton-server * couchdb-javascript-tests * couchdb-query-server-spidermonkey Repositories to archive === * couchdb-cassim * couchdb-chttpd * couchdb-couch * couchdb-couch-collate * couchdb-couch-dbupdates * couchdb-couch-epi * couchdb-couch-event * couchdb-couch-httpd * couchdb-couch-index * couchdb-couch-log * couchdb-couch-log-lager * couchdb-couch-mrview * couchdb-couch-plugins * couchdb-couch-replicator * couchdb-couch-stats * couchdb-ddoc-cache * couchdb-erlang-bcrypt * couchdb-erlang-tests * couchdb-examples * couchdb-fabric * couchdb-futon * couchdb-global-changes * couchdb-goldrush * couchdb-jquery-couch * couchdb-lager * couchdb-mango * couchdb-mem3 * couchdb-nmo * couchdb-oauth * couchdb-peruser * couchdb-query-server-node * couchdb-rexi * couchdb-setup * couchdb-smoosh * couchdb-triq * couchdb-twig [1] https://gist.github.com/davisp/9de8fa167812f80356d4990e390c9351 On Wed, Sep 16, 2020 at 10:49 AM Paul Davis wrote: > > Right. I figure that's basically an ASF version of the `gh-pages` branch? > > On Wed, Sep 16, 2020 at 10:39 AM Joan Touzet wrote: > > > > > > On 16/09/2020 11:39, Paul Davis wrote: > > > On Wed, Sep 16, 2020 at 10:32 AM Joan Touzet wrote: > > >> > > >> > > >> > > >> On 16/09/2020 10:57, Paul Davis wrote: > > >>> Hey all, > > >>> > > >>> Here's a list of all CouchDB related repositories with a few quick > > >>> stats and my read on their status and requirements. Can I get some > > >>> eyeballs on this to double check before I submit a ticket to infra > > >>> for doing our branch renaming updates? > > >>> > > >>> https://gist.github.com/davisp/9de8fa167812f80356d4990e390c9351 > > >>> > > >>> There are a few repos with comments I had when I wasn't 100% sure on > > >>> the status. For ease those are: > > >>> > > >>> couchdb-couch-collate - I couldn't easily tell if this was still > > >>> used for Windows builds > > >> > > >> Nope > > >> > > >>> couchdb-fauxton-server - This is an empty repo, should we have it > > >>> deleted? > > >> > > >> Sure > > >> > > >>> couchdb-jquery-couch - Should this be archived? Has PouchDB/nano > > >>> replaced it? > > >> > > >> If I recall correctly this was part of Futon and 1.x releases? > > >> > > >>> couchdb-nmo - Should this be archived? > > >> > > >> Very old code from 2015 from Robert Kowalski to help set up > > >> clusters/etc. I don't know anything about it, and it appears > > >> unmaintained. +1 to archive > > >> > > >>> couchdb-oauth - I couldn't find this used anywhere, should we archive > > >> > > >> I remember using this extensively! 1.x asset. As we no longer officially > > >> support it (or CouchDB "plugins" in this form), +1 to archive > > >> > > >>> couchdb-www - Should this be archived or included in the rename? > > >> > > >> We already have to use asf-site branch on this, and the 'master' branch > > >> already says "you're on the wrong branch." Just have Infra change the > > >> default branch to asf-site, no need to master -> main here IMO. > > >> > > > > > > Want me to have infra change the default branch to `asf-site` on this > > > repo? > > > > Yes please! No need to change to main here. > > > > -Joan > > > > > > > > Everything else sounds good. > > > > > >>> > > >>> Paul > > >>> > > >>> On Fri, Sep 11, 2020 at 6:28 AM Glynn Bird > > >>> wrote: > > > > +1 > > > > Happy to help reconfigure apache/couchdb-nano if necessary after > > the switch to main > > > > On Thu, 10 Sep 2020 at 10:40, Andy Wenk > > wrote: > > > > > strong +1 > > > > > > here at sum.cumo we also change the “master” branches to main > > > > > > Best > > > > > > Andy -- Andy Wenk Hamburg > > > > > > GPG fingerprint C32E 275F BCF3 9DF6 4E55 21BD 45D3 5653 77F9 > > > 3D29 > > > > > > > > > > > >> On
Re: [DISCUSS] Rename default branch to `main`
Right. I figure that's basically an ASF version of the `gh-pages` branch? On Wed, Sep 16, 2020 at 10:39 AM Joan Touzet wrote: > > > On 16/09/2020 11:39, Paul Davis wrote: > > On Wed, Sep 16, 2020 at 10:32 AM Joan Touzet wrote: > >> > >> > >> > >> On 16/09/2020 10:57, Paul Davis wrote: > >>> Hey all, > >>> > >>> Here's a list of all CouchDB related repositories with a few quick > >>> stats and my read on their status and requirements. Can I get some > >>> eyeballs on this to double check before I submit a ticket to infra > >>> for doing our branch renaming updates? > >>> > >>> https://gist.github.com/davisp/9de8fa167812f80356d4990e390c9351 > >>> > >>> There are a few repos with comments I had when I wasn't 100% sure on > >>> the status. For ease those are: > >>> > >>> couchdb-couch-collate - I couldn't easily tell if this was still > >>> used for Windows builds > >> > >> Nope > >> > >>> couchdb-fauxton-server - This is an empty repo, should we have it > >>> deleted? > >> > >> Sure > >> > >>> couchdb-jquery-couch - Should this be archived? Has PouchDB/nano > >>> replaced it? > >> > >> If I recall correctly this was part of Futon and 1.x releases? > >> > >>> couchdb-nmo - Should this be archived? > >> > >> Very old code from 2015 from Robert Kowalski to help set up > >> clusters/etc. I don't know anything about it, and it appears > >> unmaintained. +1 to archive > >> > >>> couchdb-oauth - I couldn't find this used anywhere, should we archive > >> > >> I remember using this extensively! 1.x asset. As we no longer officially > >> support it (or CouchDB "plugins" in this form), +1 to archive > >> > >>> couchdb-www - Should this be archived or included in the rename? > >> > >> We already have to use asf-site branch on this, and the 'master' branch > >> already says "you're on the wrong branch." Just have Infra change the > >> default branch to asf-site, no need to master -> main here IMO. > >> > > > > Want me to have infra change the default branch to `asf-site` on this repo? > > Yes please! No need to change to main here. > > -Joan > > > > > Everything else sounds good. > > > >>> > >>> Paul > >>> > >>> On Fri, Sep 11, 2020 at 6:28 AM Glynn Bird > >>> wrote: > > +1 > > Happy to help reconfigure apache/couchdb-nano if necessary after > the switch to main > > On Thu, 10 Sep 2020 at 10:40, Andy Wenk > wrote: > > > strong +1 > > > > here at sum.cumo we also change the “master” branches to main > > > > Best > > > > Andy -- Andy Wenk Hamburg > > > > GPG fingerprint C32E 275F BCF3 9DF6 4E55 21BD 45D3 5653 77F9 > > 3D29 > > > > > > > >> On 9. Sep 2020, at 20:09, Joan Touzet > >> wrote: > >> > >> +1. Thanks for starting this, Paul. I was actually going to try > >> and > > drive this a month or two ago, but things got busy for me. > >> > >> I'd also support renaming it to 'trunk' but really don't care > >> what we > > pick. > >> > >> The first commercial version control system I used to use, > >> called that > > branch "main": > >> > >> https://i.ibb.co/7bMDt3c/cc-ver-tree2.gif > >> > >> -Joan "yes, that's motif" Touzet > >> > >> > >> On 2020-09-09 11:40 a.m., Paul Davis wrote: > >>> Howdy Folks! Words matter. I've just started a thread on > >>> merging all of the FoundationDB work into mainline > >>> development and thought this would be a good time to bring up > >>> a separate discussion on renaming our default branch. > >>> Personally, I've got a few projects where I used `main` for > >>> the mainline development branch. I find it to be a fairly > >>> natural shift because I tab-complete everything on the > >>> command line. I'd be open to other suggestions but I'm also > >>> hoping this doesn't devolve into a bikeshed on what we end up > >>> picking. For mechanics, what I'm thinking is that when we > >>> finish up the last rebase of the FoundationDB work that > >>> instead of actually pushing the merge/rebase button we just > >>> rename the branch and then change the default branch on > >>> GitHub and close the PR. Thoughts? Paul > > > >
Re: [DISCUSS] Rename default branch to `main`
On 16/09/2020 11:39, Paul Davis wrote: On Wed, Sep 16, 2020 at 10:32 AM Joan Touzet wrote: On 16/09/2020 10:57, Paul Davis wrote: Hey all, Here's a list of all CouchDB related repositories with a few quick stats and my read on their status and requirements. Can I get some eyeballs on this to double check before I submit a ticket to infra for doing our branch renaming updates? https://gist.github.com/davisp/9de8fa167812f80356d4990e390c9351 There are a few repos with comments I had when I wasn't 100% sure on the status. For ease those are: couchdb-couch-collate - I couldn't easily tell if this was still used for Windows builds Nope couchdb-fauxton-server - This is an empty repo, should we have it deleted? Sure couchdb-jquery-couch - Should this be archived? Has PouchDB/nano replaced it? If I recall correctly this was part of Futon and 1.x releases? couchdb-nmo - Should this be archived? Very old code from 2015 from Robert Kowalski to help set up clusters/etc. I don't know anything about it, and it appears unmaintained. +1 to archive couchdb-oauth - I couldn't find this used anywhere, should we archive I remember using this extensively! 1.x asset. As we no longer officially support it (or CouchDB "plugins" in this form), +1 to archive couchdb-www - Should this be archived or included in the rename? We already have to use asf-site branch on this, and the 'master' branch already says "you're on the wrong branch." Just have Infra change the default branch to asf-site, no need to master -> main here IMO. Want me to have infra change the default branch to `asf-site` on this repo? Yes please! No need to change to main here. -Joan Everything else sounds good. Paul On Fri, Sep 11, 2020 at 6:28 AM Glynn Bird wrote: +1 Happy to help reconfigure apache/couchdb-nano if necessary after the switch to main On Thu, 10 Sep 2020 at 10:40, Andy Wenk wrote: strong +1 here at sum.cumo we also change the “master” branches to main Best Andy -- Andy Wenk Hamburg GPG fingerprint C32E 275F BCF3 9DF6 4E55 21BD 45D3 5653 77F9 3D29 On 9. Sep 2020, at 20:09, Joan Touzet wrote: +1. Thanks for starting this, Paul. I was actually going to try and drive this a month or two ago, but things got busy for me. I'd also support renaming it to 'trunk' but really don't care what we pick. The first commercial version control system I used to use, called that branch "main": https://i.ibb.co/7bMDt3c/cc-ver-tree2.gif -Joan "yes, that's motif" Touzet On 2020-09-09 11:40 a.m., Paul Davis wrote: Howdy Folks! Words matter. I've just started a thread on merging all of the FoundationDB work into mainline development and thought this would be a good time to bring up a separate discussion on renaming our default branch. Personally, I've got a few projects where I used `main` for the mainline development branch. I find it to be a fairly natural shift because I tab-complete everything on the command line. I'd be open to other suggestions but I'm also hoping this doesn't devolve into a bikeshed on what we end up picking. For mechanics, what I'm thinking is that when we finish up the last rebase of the FoundationDB work that instead of actually pushing the merge/rebase button we just rename the branch and then change the default branch on GitHub and close the PR. Thoughts? Paul
Re: [DISCUSS] Rename default branch to `main`
On Wed, Sep 16, 2020 at 10:32 AM Joan Touzet wrote: > > > > On 16/09/2020 10:57, Paul Davis wrote: > > Hey all, > > > > Here's a list of all CouchDB related repositories with a few quick > > stats and my read on their status and requirements. Can I get some > > eyeballs on this to double check before I submit a ticket to infra > > for doing our branch renaming updates? > > > > https://gist.github.com/davisp/9de8fa167812f80356d4990e390c9351 > > > > There are a few repos with comments I had when I wasn't 100% sure on > > the status. For ease those are: > > > > couchdb-couch-collate - I couldn't easily tell if this was still > > used for Windows builds > > Nope > > > couchdb-fauxton-server - This is an empty repo, should we have it > > deleted? > > Sure > > > couchdb-jquery-couch - Should this be archived? Has PouchDB/nano > > replaced it? > > If I recall correctly this was part of Futon and 1.x releases? > > > couchdb-nmo - Should this be archived? > > Very old code from 2015 from Robert Kowalski to help set up > clusters/etc. I don't know anything about it, and it appears > unmaintained. +1 to archive > > > couchdb-oauth - I couldn't find this used anywhere, should we archive > > I remember using this extensively! 1.x asset. As we no longer officially > support it (or CouchDB "plugins" in this form), +1 to archive > > > couchdb-www - Should this be archived or included in the rename? > > We already have to use asf-site branch on this, and the 'master' branch > already says "you're on the wrong branch." Just have Infra change the > default branch to asf-site, no need to master -> main here IMO. > Want me to have infra change the default branch to `asf-site` on this repo? Everything else sounds good. > > > > Paul > > > > On Fri, Sep 11, 2020 at 6:28 AM Glynn Bird > > wrote: > >> > >> +1 > >> > >> Happy to help reconfigure apache/couchdb-nano if necessary after > >> the switch to main > >> > >> On Thu, 10 Sep 2020 at 10:40, Andy Wenk > >> wrote: > >> > >>> strong +1 > >>> > >>> here at sum.cumo we also change the “master” branches to main > >>> > >>> Best > >>> > >>> Andy -- Andy Wenk Hamburg > >>> > >>> GPG fingerprint C32E 275F BCF3 9DF6 4E55 21BD 45D3 5653 77F9 > >>> 3D29 > >>> > >>> > >>> > On 9. Sep 2020, at 20:09, Joan Touzet > wrote: > > +1. Thanks for starting this, Paul. I was actually going to try > and > >>> drive this a month or two ago, but things got busy for me. > > I'd also support renaming it to 'trunk' but really don't care > what we > >>> pick. > > The first commercial version control system I used to use, > called that > >>> branch "main": > > https://i.ibb.co/7bMDt3c/cc-ver-tree2.gif > > -Joan "yes, that's motif" Touzet > > > On 2020-09-09 11:40 a.m., Paul Davis wrote: > > Howdy Folks! Words matter. I've just started a thread on > > merging all of the FoundationDB work into mainline > > development and thought this would be a good time to bring up > > a separate discussion on renaming our default branch. > > Personally, I've got a few projects where I used `main` for > > the mainline development branch. I find it to be a fairly > > natural shift because I tab-complete everything on the > > command line. I'd be open to other suggestions but I'm also > > hoping this doesn't devolve into a bikeshed on what we end up > > picking. For mechanics, what I'm thinking is that when we > > finish up the last rebase of the FoundationDB work that > > instead of actually pushing the merge/rebase button we just > > rename the branch and then change the default branch on > > GitHub and close the PR. Thoughts? Paul > >>> > >>>
Re: [DISCUSS] Rename default branch to `main`
On 16/09/2020 10:57, Paul Davis wrote: Hey all, Here's a list of all CouchDB related repositories with a few quick stats and my read on their status and requirements. Can I get some eyeballs on this to double check before I submit a ticket to infra for doing our branch renaming updates? https://gist.github.com/davisp/9de8fa167812f80356d4990e390c9351 There are a few repos with comments I had when I wasn't 100% sure on the status. For ease those are: couchdb-couch-collate - I couldn't easily tell if this was still used for Windows builds Nope couchdb-fauxton-server - This is an empty repo, should we have it deleted? Sure couchdb-jquery-couch - Should this be archived? Has PouchDB/nano replaced it? If I recall correctly this was part of Futon and 1.x releases? couchdb-nmo - Should this be archived? Very old code from 2015 from Robert Kowalski to help set up clusters/etc. I don't know anything about it, and it appears unmaintained. +1 to archive couchdb-oauth - I couldn't find this used anywhere, should we archive I remember using this extensively! 1.x asset. As we no longer officially support it (or CouchDB "plugins" in this form), +1 to archive couchdb-www - Should this be archived or included in the rename? We already have to use asf-site branch on this, and the 'master' branch already says "you're on the wrong branch." Just have Infra change the default branch to asf-site, no need to master -> main here IMO. Paul On Fri, Sep 11, 2020 at 6:28 AM Glynn Bird wrote: +1 Happy to help reconfigure apache/couchdb-nano if necessary after the switch to main On Thu, 10 Sep 2020 at 10:40, Andy Wenk wrote: strong +1 here at sum.cumo we also change the “master” branches to main Best Andy -- Andy Wenk Hamburg GPG fingerprint C32E 275F BCF3 9DF6 4E55 21BD 45D3 5653 77F9 3D29 On 9. Sep 2020, at 20:09, Joan Touzet wrote: +1. Thanks for starting this, Paul. I was actually going to try and drive this a month or two ago, but things got busy for me. I'd also support renaming it to 'trunk' but really don't care what we pick. The first commercial version control system I used to use, called that branch "main": https://i.ibb.co/7bMDt3c/cc-ver-tree2.gif -Joan "yes, that's motif" Touzet On 2020-09-09 11:40 a.m., Paul Davis wrote: Howdy Folks! Words matter. I've just started a thread on merging all of the FoundationDB work into mainline development and thought this would be a good time to bring up a separate discussion on renaming our default branch. Personally, I've got a few projects where I used `main` for the mainline development branch. I find it to be a fairly natural shift because I tab-complete everything on the command line. I'd be open to other suggestions but I'm also hoping this doesn't devolve into a bikeshed on what we end up picking. For mechanics, what I'm thinking is that when we finish up the last rebase of the FoundationDB work that instead of actually pushing the merge/rebase button we just rename the branch and then change the default branch on GitHub and close the PR. Thoughts? Paul
Re: [DISCUSS] Rename default branch to `main`
Hey all, Here's a list of all CouchDB related repositories with a few quick stats and my read on their status and requirements. Can I get some eyeballs on this to double check before I submit a ticket to infra for doing our branch renaming updates? https://gist.github.com/davisp/9de8fa167812f80356d4990e390c9351 There are a few repos with comments I had when I wasn't 100% sure on the status. For ease those are: couchdb-couch-collate - I couldn't easily tell if this was still used for Windows builds couchdb-fauxton-server - This is an empty repo, should we have it deleted? couchdb-jquery-couch - Should this be archived? Has PouchDB/nano replaced it? couchdb-nmo - Should this be archived? couchdb-oauth - I couldn't find this used anywhere, should we archive it? couchdb-www - Should this be archived or included in the rename? Paul On Fri, Sep 11, 2020 at 6:28 AM Glynn Bird wrote: > > +1 > > Happy to help reconfigure apache/couchdb-nano if necessary after the switch > to main > > On Thu, 10 Sep 2020 at 10:40, Andy Wenk wrote: > > > strong +1 > > > > here at sum.cumo we also change the “master” branches to main > > > > Best > > > > Andy > > -- > > Andy Wenk > > Hamburg > > > > GPG fingerprint C32E 275F BCF3 9DF6 4E55 21BD 45D3 5653 77F9 3D29 > > > > > > > > > On 9. Sep 2020, at 20:09, Joan Touzet wrote: > > > > > > +1. Thanks for starting this, Paul. I was actually going to try and > > drive this a month or two ago, but things got busy for me. > > > > > > I'd also support renaming it to 'trunk' but really don't care what we > > pick. > > > > > > The first commercial version control system I used to use, called that > > branch "main": > > > > > > https://i.ibb.co/7bMDt3c/cc-ver-tree2.gif > > > > > > -Joan "yes, that's motif" Touzet > > > > > > > > > On 2020-09-09 11:40 a.m., Paul Davis wrote: > > >> Howdy Folks! > > >> Words matter. I've just started a thread on merging all of the > > >> FoundationDB work into mainline development and thought this would be > > >> a good time to bring up a separate discussion on renaming our default > > >> branch. > > >> Personally, I've got a few projects where I used `main` for the > > >> mainline development branch. I find it to be a fairly natural shift > > >> because I tab-complete everything on the command line. I'd be open to > > >> other suggestions but I'm also hoping this doesn't devolve into a > > >> bikeshed on what we end up picking. > > >> For mechanics, what I'm thinking is that when we finish up the last > > >> rebase of the FoundationDB work that instead of actually pushing the > > >> merge/rebase button we just rename the branch and then change the > > >> default branch on GitHub and close the PR. > > >> Thoughts? > > >> Paul > > > >
Re: [DISCUSS] Rename default branch to `main`
+1 Happy to help reconfigure apache/couchdb-nano if necessary after the switch to main On Thu, 10 Sep 2020 at 10:40, Andy Wenk wrote: > strong +1 > > here at sum.cumo we also change the “master” branches to main > > Best > > Andy > -- > Andy Wenk > Hamburg > > GPG fingerprint C32E 275F BCF3 9DF6 4E55 21BD 45D3 5653 77F9 3D29 > > > > > On 9. Sep 2020, at 20:09, Joan Touzet wrote: > > > > +1. Thanks for starting this, Paul. I was actually going to try and > drive this a month or two ago, but things got busy for me. > > > > I'd also support renaming it to 'trunk' but really don't care what we > pick. > > > > The first commercial version control system I used to use, called that > branch "main": > > > > https://i.ibb.co/7bMDt3c/cc-ver-tree2.gif > > > > -Joan "yes, that's motif" Touzet > > > > > > On 2020-09-09 11:40 a.m., Paul Davis wrote: > >> Howdy Folks! > >> Words matter. I've just started a thread on merging all of the > >> FoundationDB work into mainline development and thought this would be > >> a good time to bring up a separate discussion on renaming our default > >> branch. > >> Personally, I've got a few projects where I used `main` for the > >> mainline development branch. I find it to be a fairly natural shift > >> because I tab-complete everything on the command line. I'd be open to > >> other suggestions but I'm also hoping this doesn't devolve into a > >> bikeshed on what we end up picking. > >> For mechanics, what I'm thinking is that when we finish up the last > >> rebase of the FoundationDB work that instead of actually pushing the > >> merge/rebase button we just rename the branch and then change the > >> default branch on GitHub and close the PR. > >> Thoughts? > >> Paul > >
Re: [DISCUSS] Rename default branch to `main`
strong +1 here at sum.cumo we also change the “master” branches to main Best Andy -- Andy Wenk Hamburg GPG fingerprint C32E 275F BCF3 9DF6 4E55 21BD 45D3 5653 77F9 3D29 > On 9. Sep 2020, at 20:09, Joan Touzet wrote: > > +1. Thanks for starting this, Paul. I was actually going to try and drive > this a month or two ago, but things got busy for me. > > I'd also support renaming it to 'trunk' but really don't care what we pick. > > The first commercial version control system I used to use, called that branch > "main": > > https://i.ibb.co/7bMDt3c/cc-ver-tree2.gif > > -Joan "yes, that's motif" Touzet > > > On 2020-09-09 11:40 a.m., Paul Davis wrote: >> Howdy Folks! >> Words matter. I've just started a thread on merging all of the >> FoundationDB work into mainline development and thought this would be >> a good time to bring up a separate discussion on renaming our default >> branch. >> Personally, I've got a few projects where I used `main` for the >> mainline development branch. I find it to be a fairly natural shift >> because I tab-complete everything on the command line. I'd be open to >> other suggestions but I'm also hoping this doesn't devolve into a >> bikeshed on what we end up picking. >> For mechanics, what I'm thinking is that when we finish up the last >> rebase of the FoundationDB work that instead of actually pushing the >> merge/rebase button we just rename the branch and then change the >> default branch on GitHub and close the PR. >> Thoughts? >> Paul
Re: [DISCUSS] Rename default branch to `main`
On Wed, Sep 9, 2020 at 8:09 PM Joan Touzet wrote: > I'd also support renaming it to 'trunk' but really don't care what we pick. > > The first commercial version control system I used to use, called that > branch "main": > >https://i.ibb.co/7bMDt3c/cc-ver-tree2.gif > Wow, that's really history, thanks for bringing back memories :D 'trunk' is very SVN-ish :-))) Alessio
Re: [DISCUSS] Rename default branch to `main`
+1. Thanks for starting this, Paul. I was actually going to try and drive this a month or two ago, but things got busy for me. I'd also support renaming it to 'trunk' but really don't care what we pick. The first commercial version control system I used to use, called that branch "main": https://i.ibb.co/7bMDt3c/cc-ver-tree2.gif -Joan "yes, that's motif" Touzet On 2020-09-09 11:40 a.m., Paul Davis wrote: Howdy Folks! Words matter. I've just started a thread on merging all of the FoundationDB work into mainline development and thought this would be a good time to bring up a separate discussion on renaming our default branch. Personally, I've got a few projects where I used `main` for the mainline development branch. I find it to be a fairly natural shift because I tab-complete everything on the command line. I'd be open to other suggestions but I'm also hoping this doesn't devolve into a bikeshed on what we end up picking. For mechanics, what I'm thinking is that when we finish up the last rebase of the FoundationDB work that instead of actually pushing the merge/rebase button we just rename the branch and then change the default branch on GitHub and close the PR. Thoughts? Paul
Re: [DISCUSS] Rename default branch to `main`
+1 This conversation kind of spilled into the other thread about merging, so I replied there as well about main vs master and rebasing. Sorry about the confusion. On Wed, Sep 9, 2020 at 2:05 PM Robert Samuel Newson wrote: > > I'm +1 in favour of renaming to 'main'. > > > > > On 9 Sep 2020, at 18:26, Alessio 'Blaster' Biancalana > > wrote: > > > > I'm not against nor in favor :-D > > Words matter but in my opinion git's master was never _that_ master. > > Anyway, if it bothers someone... let's do this! > > > > Concerning open PRs, I don't know, I think original authors can easily > > rebase. Also, the next release will cut some stuff open I think, so maybe > > we'll find a feasible time slot to do so. > > > > Alessio > > > > On Wed, Sep 9, 2020 at 5:40 PM Paul Davis > > wrote: > > > >> Howdy Folks! > >> > >> Words matter. I've just started a thread on merging all of the > >> FoundationDB work into mainline development and thought this would be > >> a good time to bring up a separate discussion on renaming our default > >> branch. > >> > >> Personally, I've got a few projects where I used `main` for the > >> mainline development branch. I find it to be a fairly natural shift > >> because I tab-complete everything on the command line. I'd be open to > >> other suggestions but I'm also hoping this doesn't devolve into a > >> bikeshed on what we end up picking. > >> > >> For mechanics, what I'm thinking is that when we finish up the last > >> rebase of the FoundationDB work that instead of actually pushing the > >> merge/rebase button we just rename the branch and then change the > >> default branch on GitHub and close the PR. > >> > >> Thoughts? > >> > >> Paul > >> >
Re: [DISCUSS] Rename default branch to `main`
I'm +1 in favour of renaming to 'main'. > On 9 Sep 2020, at 18:26, Alessio 'Blaster' Biancalana > wrote: > > I'm not against nor in favor :-D > Words matter but in my opinion git's master was never _that_ master. > Anyway, if it bothers someone... let's do this! > > Concerning open PRs, I don't know, I think original authors can easily > rebase. Also, the next release will cut some stuff open I think, so maybe > we'll find a feasible time slot to do so. > > Alessio > > On Wed, Sep 9, 2020 at 5:40 PM Paul Davis > wrote: > >> Howdy Folks! >> >> Words matter. I've just started a thread on merging all of the >> FoundationDB work into mainline development and thought this would be >> a good time to bring up a separate discussion on renaming our default >> branch. >> >> Personally, I've got a few projects where I used `main` for the >> mainline development branch. I find it to be a fairly natural shift >> because I tab-complete everything on the command line. I'd be open to >> other suggestions but I'm also hoping this doesn't devolve into a >> bikeshed on what we end up picking. >> >> For mechanics, what I'm thinking is that when we finish up the last >> rebase of the FoundationDB work that instead of actually pushing the >> merge/rebase button we just rename the branch and then change the >> default branch on GitHub and close the PR. >> >> Thoughts? >> >> Paul >>
Re: [DISCUSS] Rename default branch to `main`
I'm not against nor in favor :-D Words matter but in my opinion git's master was never _that_ master. Anyway, if it bothers someone... let's do this! Concerning open PRs, I don't know, I think original authors can easily rebase. Also, the next release will cut some stuff open I think, so maybe we'll find a feasible time slot to do so. Alessio On Wed, Sep 9, 2020 at 5:40 PM Paul Davis wrote: > Howdy Folks! > > Words matter. I've just started a thread on merging all of the > FoundationDB work into mainline development and thought this would be > a good time to bring up a separate discussion on renaming our default > branch. > > Personally, I've got a few projects where I used `main` for the > mainline development branch. I find it to be a fairly natural shift > because I tab-complete everything on the command line. I'd be open to > other suggestions but I'm also hoping this doesn't devolve into a > bikeshed on what we end up picking. > > For mechanics, what I'm thinking is that when we finish up the last > rebase of the FoundationDB work that instead of actually pushing the > merge/rebase button we just rename the branch and then change the > default branch on GitHub and close the PR. > > Thoughts? > > Paul >
Re: [DISCUSS] Rename default branch to `main`
Alexander, Any PRs that aren't trivially rebased against the current prototype/fdb-layer will by definition break regardless of what we call our default branch moving forward. Paul On Wed, Sep 9, 2020 at 11:11 AM Jan Lehnardt wrote: > > I’m in favour and I think the FDB merge is a nice opportunity to take > the plunge. > > Best > Jan > — > > On 9. Sep 2020, at 17:40, Paul Davis wrote: > > > > Howdy Folks! > > > > Words matter. I've just started a thread on merging all of the > > FoundationDB work into mainline development and thought this would be > > a good time to bring up a separate discussion on renaming our default > > branch. > > > > Personally, I've got a few projects where I used `main` for the > > mainline development branch. I find it to be a fairly natural shift > > because I tab-complete everything on the command line. I'd be open to > > other suggestions but I'm also hoping this doesn't devolve into a > > bikeshed on what we end up picking. > > > > For mechanics, what I'm thinking is that when we finish up the last > > rebase of the FoundationDB work that instead of actually pushing the > > merge/rebase button we just rename the branch and then change the > > default branch on GitHub and close the PR. > > > > Thoughts? > > > > Paul >
Re: [DISCUSS] Rename default branch to `main`
I’m in favour and I think the FDB merge is a nice opportunity to take the plunge. Best Jan — > On 9. Sep 2020, at 17:40, Paul Davis wrote: > > Howdy Folks! > > Words matter. I've just started a thread on merging all of the > FoundationDB work into mainline development and thought this would be > a good time to bring up a separate discussion on renaming our default > branch. > > Personally, I've got a few projects where I used `main` for the > mainline development branch. I find it to be a fairly natural shift > because I tab-complete everything on the command line. I'd be open to > other suggestions but I'm also hoping this doesn't devolve into a > bikeshed on what we end up picking. > > For mechanics, what I'm thinking is that when we finish up the last > rebase of the FoundationDB work that instead of actually pushing the > merge/rebase button we just rename the branch and then change the > default branch on GitHub and close the PR. > > Thoughts? > > Paul
Re: [DISCUSS] Rename default branch to `main`
This obviously will break all the current PR to master branch just because of naming. Is it worth this? What problems renaming will solve? And why does that suddenly become important? -- ,,,^..^,,, On Wed, Sep 9, 2020 at 6:40 PM Paul Davis wrote: > Howdy Folks! > > Words matter. I've just started a thread on merging all of the > FoundationDB work into mainline development and thought this would be > a good time to bring up a separate discussion on renaming our default > branch. > > Personally, I've got a few projects where I used `main` for the > mainline development branch. I find it to be a fairly natural shift > because I tab-complete everything on the command line. I'd be open to > other suggestions but I'm also hoping this doesn't devolve into a > bikeshed on what we end up picking. > > For mechanics, what I'm thinking is that when we finish up the last > rebase of the FoundationDB work that instead of actually pushing the > merge/rebase button we just rename the branch and then change the > default branch on GitHub and close the PR. > > Thoughts? > > Paul >
[DISCUSS] Rename default branch to `main`
Howdy Folks! Words matter. I've just started a thread on merging all of the FoundationDB work into mainline development and thought this would be a good time to bring up a separate discussion on renaming our default branch. Personally, I've got a few projects where I used `main` for the mainline development branch. I find it to be a fairly natural shift because I tab-complete everything on the command line. I'd be open to other suggestions but I'm also hoping this doesn't devolve into a bikeshed on what we end up picking. For mechanics, what I'm thinking is that when we finish up the last rebase of the FoundationDB work that instead of actually pushing the merge/rebase button we just rename the branch and then change the default branch on GitHub and close the PR. Thoughts? Paul
