From 624598d2a9f14336cac4bf74b85b972a1085580f Mon Sep 17 00:00:00 2001 From: Gabor Melis Date: Mon, 22 Sep 2008 18:41:43 +0000 Subject: [PATCH] 1.0.20.21: how to miss version.lisp-expr --- doc/GIT-FOR-SBCL-HACKERS.txt | 6 +++++- version.lisp-expr | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/GIT-FOR-SBCL-HACKERS.txt b/doc/GIT-FOR-SBCL-HACKERS.txt index ae9446bc8..e4dcd7bd3 100644 --- a/doc/GIT-FOR-SBCL-HACKERS.txt +++ b/doc/GIT-FOR-SBCL-HACKERS.txt @@ -282,7 +282,7 @@ issues manually: .msg -- holds the commit message Finally, delete the foo-hacks-to-cvs branch after you've committed -code to CVS. Of course, instead of using git-cvexportcommit you can +code to CVS. Of course, instead of using git-cvsexportcommit you can also manually make and apply patches, etc. For hairier cases it may even be easier in the end: @@ -307,6 +307,10 @@ from, do on the branch you want to update on your private repository. +Note that if you edit version.lisp-expr in the CVS tree and not before +then the cvs commit command that git-cvsexportcommit prints does not +list version.lisp-expr, so don't copy paste it. + This completes our whirlwind tour. I'm not saying this makes you proficient in using Git, but at least you should be up and walking. Reading diff --git a/version.lisp-expr b/version.lisp-expr index 53111bf79..3a8fe56d9 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.20.20" +"1.0.20.21" -- 2.11.4.GIT