commit 0fc1ef2d08d9c4c12f9cf7bbb37ab537f4295e80 from: Stefan Sperling date: Fri Sep 29 13:45:02 2023 UTC suggest a better strategy to deal with nsh-version.mk modifications commit - 148870ff891768bfbb766248d3369041434020f1 commit + 0fc1ef2d08d9c4c12f9cf7bbb37ab537f4295e80 blob - 2b22deeac4232d213cdf86ded8f790452e09f584 blob + 96124f03f17e464b55961619ea2b72508249a595 --- nsh-version.mk +++ nsh-version.mk @@ -44,9 +44,10 @@ # Before running 'make release' again, ensure your work tree is clean. # In any case, remove botched generated tarballs and new dist-list files: # rm nsh-1.x.tar.gz nsh-dist.txt.new -# If an error left behind any nsh-version.mk modifications, revert them: -# With Git: git restore nsh-version.mk -# With Got: got revert nsh-version.mk +# If an error left behind any nsh-version.mk modifications, revert them, +# keeping the version number bump intact: +# With Git: git restore -p nsh-version.mk +# With Got: got revert -p nsh-version.mk # # 4) Copy nsh-1.x.tar.gz to /usr/ports/distfiles and update the # nsh port in /usr/ports/shells/nsh to the new release.