All development now on new branch "main" #2364
julian-smith-artifex-com
started this conversation in
Announcements
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
We have moved all PyMuPDF development to a single new branch
main
.The new branch
main
is now the repository's default branch; so for example agit clone
will result in a checkout ofmain
, notmaster
.The old branches
1.21
andmaster
will no longer be used.Reasons for doing this:
The use of a separate release branch wasn't really helping PyMuPDF
development, because we don't generally release patches for old releases.
We've recently started testing the latest PyMuPDF in git with different
versions of MuPDF, using a small number of
#if...#endif
constructs in thecode to cope with the occasional changes to the MuPDF API.
This has proved to be much simpler in practise than, for example, having
a separate branch of PyMuPFD for the current MuPDF
1.xx
release and forMuPDF's master branch.
Github doesn't make it easy for workflows to be on a non-default branch. So
we previously had (most) workflows on
master
, even though all code/docswork was on branch
1.21
. This was confusing to work with.We are using
main
instead ofmaster
for the reasons described inhttps://github.com/github/renaming.
The new branch
main
is a copy of the old1.21
branch, with some new commitsadded:
A commit to revert the small number of unused commits to workflows that were
made on branch
1.21
after it branched offmaster
.Cherry-picks of all workflow-related commits on
master
since1.21
wascreated.
Thus branch
main
now contains all of the useful code, docs and workflows fromthe old branches
1.21
andmaster
.Notes about changing history:
The git history of code/docs commits (from branch
1.21
) is unchanged.The history of workflow scripts etc (from
master
) is changed in git.Moving to a single branch will always involve changing history somewhere; we've
choosen to do this for the relatively small number of workflow commits, not
the large number of code/docs commits.
Here's an ascii-art description of the branches, oldest commits first.
(f0b0a93 is the git sha where branch
1.21
was created frommaster
.):Beta Was this translation helpful? Give feedback.
All reactions