From e98ea7df1e53d3bdbe2282450b2db10a7d76962b Mon Sep 17 00:00:00 2001 From: Steffen Prohaska Date: Thu, 25 Dec 2008 14:00:59 +0100 Subject: [PATCH] HowToRelease: Modify to reflect new release process 'official git.git + patches' From now on, we create msysgit release based on Junio's official git.git + patches, as now described in HowToRelease.txt --- share/WinGit/HowToRelease.txt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/share/WinGit/HowToRelease.txt b/share/WinGit/HowToRelease.txt index ee742152f6..de99498429 100644 --- a/share/WinGit/HowToRelease.txt +++ b/share/WinGit/HowToRelease.txt @@ -38,6 +38,12 @@ The following criteria should be met before we go stable. For now we should only release previews. +A release is created from official git.git plus a number of patches +that are not yet in upstream. Since 1.6.0, most of the MinGW port is +included in Junio's official git.git. A few patches, however, are not +yet included. Those patches are maintained as a branch 'release' that +is regularily rebased onto Junio's master. A msysgit release is +tagged by a tag having a postfix '-msysgit'. He are the step by step instructions for the maintainer: @@ -46,11 +52,18 @@ He are the step by step instructions for the maintainer: git fetch junio git checkout devel git merge mingw/master - make clean - make install + git merge junio/master make -k test | tee test.log # check test.log + git checkout release + git rebase junio/master + # check that differences between devel and release + # are only trivial ones, i.e. tests, that do not + # change the released binaries. + make clean + make install git push . devel:master # should fast-forward + git tag -a -msysgit1 cd /doc/git/html git fetch -- 2.11.4.GIT