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

[mhenoch at common-lisp.net]

Author: mhenoch
Date: Tue Oct 31 19:37:45 2006
New Revision: 64

Modified:
   cl-darcs/trunk/pull.lisp
Log:
Use PATCHINFO instead of PI in lambda functions.


Modified: cl-darcs/trunk/pull.lisp
==============================================================================
--- cl-darcs/trunk/pull.lisp	(original)
+++ cl-darcs/trunk/pull.lisp	Tue Oct 31 19:37:45 2006
@@ -36,12 +36,12 @@
       ;; XXX: This is where we pick which of their patches we want to
       ;; pull.
       (let* ((their-patches
-	      (mapcar (lambda (pi)
-			(read-patch-from-repo theirrepo pi))
+	      (mapcar (lambda (patchinfo)
+			(read-patch-from-repo theirrepo patchinfo))
 		      only-theirs))
 	     (our-patches
-	      (mapcar (lambda (pi)
-			(read-patch-from-repo ourrepo pi))
+	      (mapcar (lambda (patchinfo)
+			(read-patch-from-repo ourrepo patchinfo))
 		      only-ours))
 	     (merged-patches (patches
 			      (merge-patches (make-instance 'composite-patch