[GRASS-dev] Renaming master branch to main branch

2021-08-18 Thread Vaclav Petras
Dear all, I will rename our default branch currently called master to main in the following days. We already discussed it here and there, but the rename should be relatively smooth. Much simpler than the addons repo reorganization. Users not compiling code themselves should not be affected. Contri

Re: [GRASS-dev] Renaming master branch to main branch

2021-08-19 Thread Jeff McKenna
Here are some screen captures for these same steps, that I created back in January for the MapServer community: https://github.com/MapServer/MapServer/wiki/Renamed-Default-Branch -jeff -- Jeff McKenna GatewayGeo: Developers of MS4W, MapServer Consulting and Training co-founder of FOSS4G htt

Re: [GRASS-dev] Renaming master branch to main branch

2021-08-22 Thread Vaclav Petras
Dear all, The master branch was renamed to main. Please update your local repositories and workflows accordingly. ## 1. Local repo update and branch rename If you are contributing code or compiling source code from Git, you need to modify your local repository as well. Go to your fork's website

Re: [GRASS-dev] Renaming master branch to main branch

2021-08-25 Thread Nikos Alexandris
Thank you Vaclav. Will the same name-update happen for the addons? Nikos___ grass-dev mailing list grass-dev@lists.osgeo.org https://lists.osgeo.org/mailman/listinfo/grass-dev

Re: [GRASS-dev] Renaming master branch to main branch

2021-08-25 Thread Veronica Andreo
Well, since addon repo structure changed and master is no longer used as base branch, but grass7, and eventually it will be grass8, the name change does not seem very relevant or urgent there, no? Not strong opinion though Vero El mié, 25 ago 2021 a las 21:21, Nikos Alexandris () escribió: > Th

Re: [GRASS-dev] Renaming master branch to main branch

2021-08-25 Thread Vaclav Petras
On Wed, Aug 25, 2021 at 3:32 PM Veronica Andreo wrote: > Well, since addon repo structure changed and master is no longer used as > base branch, but grass7, and eventually it will be grass8, the name change > does not seem very relevant or urgent there, no? > That is correct. A much larger chang

Re: [GRASS-dev] Renaming master branch to main branch

2021-09-10 Thread Markus Metz
Probably a silly question: I'm having problems with rebasing my local feature branches for PRs, e.g. for https://github.com/OSGeo/grass/pull/1786 My local main branch is up to date with the official main branch. In my case the grass repo is the remote named origin, my fork is the remote named metz

Re: [GRASS-dev] Renaming master branch to main branch

2021-09-10 Thread Vaclav Petras
On Fri, Sep 10, 2021 at 1:16 PM Markus Metz wrote: > ... > $ git checkout raster_tempdir > $ git rebase main > > Successfully rebased and updated refs/heads/raster_tempdir. > > $ git status > On branch raster_tempdir > Your branch and 'metzm/raster_tempdir' have diverged, > and have 48 and 7 diff

Re: [GRASS-dev] Renaming master branch to main branch

2021-09-10 Thread Markus Metz
On Fri, Sep 10, 2021 at 7:51 PM Vaclav Petras wrote: > > > > On Fri, Sep 10, 2021 at 1:16 PM Markus Metz wrote: >> >> ... >> $ git checkout raster_tempdir >> $ git rebase main >> >> Successfully rebased and updated refs/heads/raster_tempdir. >> >> $ git status >> On branch raster_tempdir >> Your

Re: [GRASS-dev] Renaming master branch to main branch

2021-09-10 Thread Vaclav Petras
On Fri, Sep 10, 2021 at 2:30 PM Markus Metz wrote: > > The commit history of the PR has not been messed up, only the relevant > commits are shown. > Right, right, Git or GitHub recognizes that thoise 41 are already on main. The reason for the rebase was that some tests were failing, apparently

Re: [GRASS-dev] Renaming master branch to main branch

2021-09-10 Thread Markus Metz
On Fri, Sep 10, 2021 at 8:46 PM Vaclav Petras wrote: > > On Fri, Sep 10, 2021 at 2:30 PM Markus Metz wrote: >> >> The reason for the rebase was that some tests were failing, apparently because of a combination of renaming master to main and changes to GHA, and a PR can only be squashed and merged

Re: [GRASS-dev] Renaming master branch to main branch

2021-09-10 Thread Vaclav Petras
On Fri, Sep 10, 2021 at 4:36 PM Markus Metz wrote: > > ...all the previously timed-out tests for the affected PRs are passed... > As for the timed-out tests - those which are running actual test suites and time out after 6 hours - that's actually still an issue. It just usually does not happen.