[Cl-darcs-cvs] r97 - cl-darcs/trunk

mhenoch at common-lisp.net mhenoch at common-lisp.net
Mon Feb 19 22:06:39 UTC 2007


Author: mhenoch
Date: Mon Feb 19 17:06:39 2007
New Revision: 97

Modified:
   cl-darcs/trunk/commute.lisp
Log:
Fix misplaced parenthesis in COMMUTE for two hunk-patches


Modified: cl-darcs/trunk/commute.lisp
==============================================================================
--- cl-darcs/trunk/commute.lisp	(original)
+++ cl-darcs/trunk/commute.lisp	Mon Feb 19 17:06:39 2007
@@ -113,7 +113,7 @@
 	       (make-instance 'hunk-patch :filename (patch-filename p2)
 			      :line-number (+ line2 (- (length new1)) (length old1))
 			      :old old2 :new new2)))
-	((< (+ line2 (length old2) line1))
+	((< (+ line2 (length old2)) line1)
 	 ;; The second patch changes text before the first patch.
 	 (list (make-instance 'hunk-patch :filename (patch-filename p1)
 			      :line-number (+ line1 (length new2) (- (length old2)))



More information about the Cl-darcs-cvs mailing list