Ok, I will do that. I made only a couple of changes in Vector so I will make a separate patch for Matrix and then merge our Vector changes. This will all be easier once we have stuff in SVN. Diffing diffs is a new experience for me <grin>
Jeff -----Original Message----- From: Grant Ingersoll [mailto:[EMAIL PROTECTED] Sent: Saturday, March 01, 2008 5:44 PM To: mahout-dev@lucene.apache.org Subject: Re: Merging 6h & 6i Mine should be all in the vector one, so apply that, and then apply yours to a clean trunk. You may have to clean up a bit, but it shouldn't be too bad. Otherwise, all I really did was replace javadocs that had Matrix1D refs. and added a Vector test. -Grant On Mar 1, 2008, at 7:08 PM, Jeff Eastman wrote: > Hi Grant, > > > > I'm trying to figure out how to merge our two recent patches, do you > have a strategy? > > > > Jeff >