Author: mhenoch Date: Wed Jul 12 15:09:17 2006 New Revision: 29 Modified: cl-darcs/trunk/merge.lisp Log: Implement merge-patches-after-patch Modified: cl-darcs/trunk/merge.lisp ============================================================================== --- cl-darcs/trunk/merge.lisp (original) +++ cl-darcs/trunk/merge.lisp Wed Jul 12 15:09:17 2006 @@ -80,4 +80,9 @@ (defun merge-patches-after-patch (p1s p2) "Create a variant of P1S that can be applied after P2. P1S is a list of patches; P2 is a patch." - (error "merge-patches-after-patch not yet implemented.")) + (destructuring-bind (p1-new p2-new) + (commute (merge-patch-after-patches p2 p1s) + (make-instance 'composite-patch :patches p1s)) + (declare (ignore p2-new)) + (patches p1-new))) +