diff options
| author | jranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb> | 2013-11-11 20:50:06 +0000 |
|---|---|---|
| committer | jranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb> | 2013-11-11 20:50:06 +0000 |
| commit | f228be9de37e9d024fee673a7a7055a8f06b228c (patch) | |
| tree | d1c12fe6841d645fa39f4856dc40c051b4eee182 | |
| parent | 4091cfd04c58cdd106b7c48c8b9a51e9179f4875 (diff) | |
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
| -rw-r--r-- | GNUmakefile | 6 |
1 files 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` |