Home

Branch overview

• cygwin/master auto-syncs with cygwin upstream
• For every cygwin release we have a branch named msys2-X_X_X-release which starts at the upstream release with our patches on top
• The current default branch is the one used for creating the pacman package and development happens there.

New changes to an existing release

• Commit to the current default branch
• Follow the instructions in the msys2-runtime packages to update the PKGBUILD etc.

Rebase on top of a new cygwin release

• Checkout out the upstream release tag
• Create a new branch: msys2-X_X_X-release
• Cherry pick the patches from the old release branch over
• Try to clean up the history, merge patches etc to make the history clean an linear (makes future updates easier)
• Make the new branch the default branch
• Follow the instructions in the msys2-runtime packages to update the PKGBUILD etc.