From f228be9de37e9d024fee673a7a7055a8f06b228c Mon Sep 17 00:00:00 2001 From: jranke Date: Mon, 11 Nov 2013 20:50:06 +0000 Subject: Adapt the makefile to presumed git workflow git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@151 edb9625f-4e0d-4859-8d74-9fd3b1da38cb --- GNUmakefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index e5cecea..ec0c031 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -56,7 +56,9 @@ test: install # Packaging Tasks #------------------------------------------------------------------------------ release: - @echo "\nCheck for updates in the svn repository" - @svn update + @echo "\nPull in changes from svn and merge local commits" + @git svn rebase @echo "\nHow about make test, make check and make vignette?" @echo "\nIs the DESCRIPTION file up to date?" + @echo "\nIf the above is taken care of, run `git svn dcommit`' + @echo "and then `git push origin master` -- cgit v1.2.1