From 62c1c94106fca74b3d191c9576cc635aaf5592bb Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Sat, 18 Aug 2007 15:13:53 +0000 Subject: [PATCH] 1.0.8.33: sample sbcl-export alias in Git for SBCL Hackers * Forgot to save the file, so missed from the last commit... --- doc/GIT-FOR-SBCL-HACKERS.txt | 11 +++++++++++ version.lisp-expr | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/GIT-FOR-SBCL-HACKERS.txt b/doc/GIT-FOR-SBCL-HACKERS.txt index 264766f..ca442e7 100644 --- a/doc/GIT-FOR-SBCL-HACKERS.txt +++ b/doc/GIT-FOR-SBCL-HACKERS.txt @@ -264,6 +264,17 @@ wish to commit the changes you have wrought on branch foo-hacks review, fix any problems cvs commit -F .msg +To make things a bit easier, add eg. this stanza to ~/sbcl-git/.git/config: + + [alias] + sbcl-export = ! cd ~/sbcl-cvs && GIT_DIR=~/sbcl-git/.git git-cvsexportcommit -v + +Then you can just run + + git sbcl-export foo-hacks-to-cvs + +from inside ~/sbcl-git/, and have it prepare your CVS tree for commit. + git-cvsexportcommit is fairly conservative by default, and will fail if the patch doens't apply cleanly. If that happens, you can fix the issues manually: diff --git a/version.lisp-expr b/version.lisp-expr index af63991..d4c6d84 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.8.32" +"1.0.8.33" -- 1.7.10.4