X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=doc%2FGIT-FOR-SBCL-HACKERS.txt;h=aedbd96f5b3751bf02a9ad9a10d300ca26d65be8;hb=e119a2f79cf36039a39996f5490934b4d927529a;hp=264766facd15b61460315dda4c206eee33b5acce;hpb=0d9184c70988bfa5d99e4a25368c155c9ced63ed;p=sbcl.git diff --git a/doc/GIT-FOR-SBCL-HACKERS.txt b/doc/GIT-FOR-SBCL-HACKERS.txt index 264766f..aedbd96 100644 --- a/doc/GIT-FOR-SBCL-HACKERS.txt +++ b/doc/GIT-FOR-SBCL-HACKERS.txt @@ -30,7 +30,7 @@ The command clones the SBCL Git mirror into the directory sbcl-git (there's a naming convention in play here, but ignore that for now.) The clone -contains full history, and is an independent repository on it's own +contains full history, and is an independent repository on its own right. Doing the clone takes as long as downloading 25Mb takes on your line, but after that things are very fast. @@ -155,7 +155,7 @@ current version as a single diff. Similarly, can be used to compare two arbitrary versions. The -w switch tells Git to ignore whitespace changes -- you can usually leave it out, but it's -nice when diffing across the great whilespacification patches. +nice when diffing across the great whitespacification patches. Onwards: just so that we have a bit more history on the branch, edit version.lisp-expr again, and git-commit again. You can use @@ -231,7 +231,7 @@ from where they end up in sbcl.git. Turtles, you see." in the comment box. Then you will be directed to set up an account, which you will then have to add as a "pusher" to your SBCL fork. -Finally, add the following snipped (adjusting for your own name) in +Finally, add the following snippet (adjusting for your own name) in ~/sbcl-git/.git/config [remote "public"] @@ -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: