> 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 that is tracking master as a remote, in which case you need to do those steps for said branch. But this is quite uncommon. > Or will I just be able to do `git merge main` once master gets renamed, and it'll just work with the name change making no difference? You should be able to do that without any problem that I can foresee once you rename it in your local fork. > PS If I think hard about it, and ponder the git model of blobs and commits, etc, I can see that no commits change with the renaming, and > the names "master" and "main" are just aliases for particular commits. So I think I've convinced myself that nothing else is needed. But that > thought process is what I mean by "not obvious" ;-) Exactly, that's the way I reason about this as well Pablo On Fri, 26 Mar 2021 at 21:19, Paul Moore <p.f.mo...@gmail.com> wrote: > On Fri, 26 Mar 2021 at 19:54, Mariatta <maria...@python.org> 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: > > > https://github.com/python/devguide/pull/662/files#diff-611263234e072dc403733b3dd46d0609cfe44b24d29f05841637b41d093adf0cR157 > > > > The details and timeline on the branch renaming can be read here: > > > > > https://mail.python.org/archives/list/python-committ...@python.org/message/QWW7KGBW5UH2N5FOZOFXQBQPYELWQM3O/ > > Thanks, that is the same set of commands I've seen in a few places. > What isn't obvious to me (but may be to the people writing the > documentation) is what happens to branches I have. If I have branch > fix_something that is branched off master from a while ago, do I need > to do anything to it? Or will I just be able to do `git merge main` > once master gets renamed, and it'll just work with the name change > making no difference? > > I suspect it *will* just work, in which case all that is needed is a > brief note making that clear. But to many of us, it's not "obvious" > that this is the case. > > Paul > > PS If I think hard about it, and ponder the git model of blobs and > commits, etc, I can see that no commits change with the renaming, and > the names "master" and "main" are just aliases for particular commits. > So I think I've convinced myself that nothing else is needed. But that > thought process is what I mean by "not obvious" ;-) > _______________________________________________ > Python-Dev mailing list -- python-dev@python.org > To unsubscribe send an email to python-dev-le...@python.org > https://mail.python.org/mailman3/lists/python-dev.python.org/ > Message archived at > https://mail.python.org/archives/list/python-dev@python.org/message/EZRUP7UEBAS65QGRSTX7UF5WNGO3DXUB/ > Code of Conduct: http://python.org/psf/codeofconduct/ >
_______________________________________________ Python-Dev mailing list -- python-dev@python.org To unsubscribe send an email to python-dev-le...@python.org https://mail.python.org/mailman3/lists/python-dev.python.org/ Message archived at https://mail.python.org/archives/list/python-dev@python.org/message/VTIWXA2KEH2WZ4MVX5OPGPJMCHCYYASK/ Code of Conduct: http://python.org/psf/codeofconduct/
