[Sbcl-commits] CVS: sbcl/src/code misc.lisp,1.2,1.3

[Nikodemus S. <de...@us...>]

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20837/src/code

Modified Files:
	misc.lisp 
Log Message:
1.0.8.15: making SBCL sources Git more friendly

 * Git for SBCL Hackers guide.

 * If branch-version.lisp-expr exists, it's value is concatenated
   after the contents of version.lisp-expr, separated out by ".".

   Doing this allows reduces spurious conflicts on branches: otherwise
   a branch announcing it's name in version.lisp-expr is going to
   conflict at every turn, which prevents automatic rebasing and
   merging from doing TRT.

 * Added .gitignore



Index: misc.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/misc.lisp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- misc.lisp	20 Oct 2000 23:30:33 -0000	1.2
+++ misc.lisp	4 Aug 2007 14:49:33 -0000	1.3
@@ -16,4 +16,8 @@
   "SBCL")
 
 (defun sb!xc:lisp-implementation-version ()
-  #.(sb-cold:read-from-file "version.lisp-expr"))
+  #.(format nil "~A~@[.~A~]"
+            (sb-cold:read-from-file "version.lisp-expr")
+            (let ((pathname "branch-version.lisp-expr"))
+              (when (probe-file pathname)
+                (sb-cold:read-from-file pathname)))))