[Python-Dev] Re: On the migration from master to main

2021-05-10 Thread Martin (gzlist) via Python-Dev
On Tue, 23 Mar 2021 at 21:39, Python Steering Council wrote: > > This isn’t happening because GitHub/Microsoft made a political decision. It’s > happening because it is incredibly easy to make this move, many projects have > already done this, and it reflects badly on any project not making

[Python-Dev] Re: On the migration from master to main

2021-05-07 Thread Nick Coghlan
On Tue, 4 May 2021, 10:50 am Łukasz Langa, wrote: > > On 4 May 2021, at 02:04, Łukasz Langa wrote: > > Having renamed the branch in my fork first, the exact sequence I used on > my own clone was: > > ❯ git checkout master > ❯ git branch -m master main > ❯ git fetch origin > ❯ git branch -u

[Python-Dev] Re: On the migration from master to main

2021-05-03 Thread Terry Reedy
On 5/3/2021 9:27 PM, Terry Reedy wrote: On 5/3/2021 7:45 PM, Tim Peters wrote: I'm guessing it's time to fiddle local CPython clones to account for master->main renaming now? Blob 2 ("upstream"): """ The CPython repository's default branch was renamed from ``master`` to ``main`` after

[Python-Dev] Re: On the migration from master to main

2021-05-03 Thread Terry Reedy
On 5/3/2021 7:45 PM, Tim Peters wrote: I'm guessing it's time to fiddle local CPython clones to account for master->main renaming now? If so, I've seen two blobs of instructions, which are very similar but not identical: Blob 1 ("origin"): """ You just need to update your local clone after

[Python-Dev] Re: On the migration from master to main

2021-05-03 Thread Łukasz Langa
> On 4 May 2021, at 02:04, Łukasz Langa wrote: > > Having renamed the branch in my fork first, the exact sequence I used on my > own clone was: > > ❯ git checkout master > ❯ git branch -m master main > ❯ git fetch origin > ❯ git branch -u origin/main main > ❯ git remote set-head origin -a > ❯

[Python-Dev] Re: On the migration from master to main

2021-05-03 Thread Ned Deily
On May 3, 2021, at 19:45, Tim Peters wrote: > Blob 1 ("origin"): > > """ > You just need to update your local clone after the branch name changes. > From the local clone of the repository on a computer, > run the following commands to update the name of the default branch. > > $ git branch -m

[Python-Dev] Re: On the migration from master to main

2021-05-03 Thread Łukasz Langa
> On 4 May 2021, at 01:45, Tim Peters wrote: > > Right? Wrong? Do we need some mix of both? Something else? Having renamed the branch in my fork first, the exact sequence I used on my own clone was: ❯ git checkout master ❯ git branch -m master main ❯ git fetch origin ❯ git branch -u

[Python-Dev] Re: On the migration from master to main

2021-05-03 Thread Tim Peters
I'm guessing it's time to fiddle local CPython clones to account for master->main renaming now? If so, I've seen two blobs of instructions, which are very similar but not identical: Blob 1 ("origin"): """ You just need to update your local clone after the branch name changes. >From the local

[Python-Dev] Re: On the migration from master to main

2021-03-26 Thread Pablo Galindo Salgado
> f I have branch fix_something that is branched off master from a while ago, do I need to do anything to it? In general no, branches are basically a file that points to a given commit so even if they branched from master the actual commit sha is what matters. The only case if you have a branch

[Python-Dev] Re: On the migration from master to main

2021-03-26 Thread Paul Moore
On Fri, 26 Mar 2021 at 19:54, Mariatta wrote: > > > The branch has not been renamed. It will be renamed after the release of beta > 1. > > There is a pending PR on DevGuide on how to change your existing local > CPython repository to the new branch: >

[Python-Dev] Re: On the migration from master to main

2021-03-26 Thread Mariatta
The branch has not been renamed. It will be renamed after the release of beta 1. There is a pending PR on DevGuide on how to change your existing local CPython repository to the new branch:

[Python-Dev] Re: On the migration from master to main

2021-03-26 Thread Skip Montanaro
Can I distract people for a moment to ask a couple procedural questions about this change? I maintain my own fork of https://github.com/python/cpython, but don't yet see a main branch on python/cpython. - When is the new main branch supposed to appear - Once it does, what will I need to do

[Python-Dev] Re: On the migration from master to main

2021-03-26 Thread Chris Angelico
On Sat, Mar 27, 2021 at 3:33 AM Baptiste Carvello wrote: > > Le 25/03/2021 à 15:59, Stefano Borini a écrit : > > On Tue, 23 Mar 2021 at 21:39, Python Steering Council > > wrote: > >> This isn’t just about ‘master’ being rooted in slavery. > > > > No it's not and I am shocked that such ignorance

[Python-Dev] Re: On the migration from master to main

2021-03-26 Thread Baptiste Carvello
Le 25/03/2021 à 15:59, Stefano Borini a écrit : > On Tue, 23 Mar 2021 at 21:39, Python Steering Council > wrote: >> This isn’t just about ‘master’ being rooted in slavery. > > No it's not and I am shocked that such ignorance would exist to believe that. It is indeed not, but the peculiar

[Python-Dev] Re: On the migration from master to main

2021-03-25 Thread Stefano Borini
On Tue, 23 Mar 2021 at 21:39, Python Steering Council wrote: > This isn’t just about ‘master’ being rooted in slavery. No it's not and I am shocked that such ignorance would exist to believe that. -- Kind regards, Stefano Borini ___ Python-Dev