Re: [collections] merging collections - DONE

2009-09-16 Thread Henri Yandell
On Tue, Sep 15, 2009 at 10:11 AM, Matt Benson wrote: > > > --- On Tue, 9/15/09, Henri Yandell wrote: > >> From: Henri Yandell >> Subject: [collections] merging collections - DONE >> To: "Commons Developers List" >> Date: Tuesday, September 15, 20

Re: [collections] merging collections - DONE

2009-09-15 Thread Matt Benson
--- On Tue, 9/15/09, Henri Yandell wrote: > From: Henri Yandell > Subject: [collections] merging collections - DONE > To: "Commons Developers List" > Date: Tuesday, September 15, 2009, 1:07 AM > On Sun, Sep 13, 2009 at 9:08 PM, > Henri Yandell > wrote: >

Re: [collections] merging collections - DONE

2009-09-14 Thread Jörg Schaible
Henri Yandell wrote at Dienstag, 15. September 2009 08:07: > On Sun, Sep 13, 2009 at 9:08 PM, Henri Yandell wrote: > >> >> Tests compile (under Maven). 4 serialization ones fail when running - >> will dig into. Might be a merging issue with .obj files and id values >> in classes. > > Fixed thes

Re: [collections] merging collections

2009-09-14 Thread Henri Yandell
As you can see from the svn commit spam, I went with a variant of b). Initially doing some large commits for files that hadn't had much change on the branch, and then doing a per file commit with additional logging for the specific changes. Apologies for the spam, but I think it'll be worth it in t

[collections] merging collections - DONE

2009-09-14 Thread Henri Yandell
On Sun, Sep 13, 2009 at 9:08 PM, Henri Yandell wrote: > > Tests compile (under Maven). 4 serialization ones fail when running - > will dig into. Might be a merging issue with .obj files and id values > in classes. Fixed these btw by setting serialVersionUIDs to the previous values as they didn't

Re: [collections] merging collections

2009-09-13 Thread Henri Yandell
On Sun, Sep 13, 2009 at 5:56 PM, Henri Yandell wrote: > > The maven build passes the syntactic part of the compiler, but about > 16 errors in the semantic part to look at. I'll look at each as it's > likely it's due to merging issues. Some may be because that code > hasn't been genericized yet an

Re: [collections] merging collections

2009-09-13 Thread Henri Yandell
On Sun, Sep 13, 2009 at 12:08 AM, Henri Yandell wrote: > > Hopeful that I can resolve the two above over the next couple of nights. Latest status update (as I'm worried this is the kind of thing that could fall off my priority list and lots of people are stuck waiting; no status updates means ha

Re: [collections] merging collections

2009-09-13 Thread Henri Yandell
Side thought if anyone feels like having an opinion. Which is better? a) One big commit, merging the branch in in one go (the usual approach). b) One commit per file, with the commit log including all of the change history of the file while it was on the branch; except for a few global commits th

Re: [collections] merging collections

2009-09-13 Thread Henri Yandell
On Sat, Sep 12, 2009 at 2:05 PM, Henri Yandell wrote: > On Sat, Sep 12, 2009 at 7:26 AM, Rahul Akolkar wrote: >> On Sat, Sep 12, 2009 at 5:52 AM, Henri Yandell wrote: >>> On Sat, Sep 12, 2009 at 2:00 AM, Henri Yandell wrote: On Fri, Sep 11, 2009 at 8:58 AM, Matt Benson wrote: > > >>>

Re: [collections] merging collections

2009-09-12 Thread Henri Yandell
On Sat, Sep 12, 2009 at 7:26 AM, Rahul Akolkar wrote: > On Sat, Sep 12, 2009 at 5:52 AM, Henri Yandell wrote: >> On Sat, Sep 12, 2009 at 2:00 AM, Henri Yandell wrote: >>> On Fri, Sep 11, 2009 at 8:58 AM, Matt Benson wrote: --- On Fri, 9/11/09, Henri Yandell wrote: > First

Re: [collections] merging collections

2009-09-12 Thread Rahul Akolkar
On Sat, Sep 12, 2009 at 5:52 AM, Henri Yandell wrote: > On Sat, Sep 12, 2009 at 2:00 AM, Henri Yandell wrote: >> On Fri, Sep 11, 2009 at 8:58 AM, Matt Benson wrote: >>> >>> >>> --- On Fri, 9/11/09, Henri Yandell wrote: >>> First up would be to cp trunk to a 3.x branch. It's also possibl

Re: [collections] merging collections

2009-09-12 Thread Henri Yandell
On Sat, Sep 12, 2009 at 2:00 AM, Henri Yandell wrote: > On Fri, Sep 11, 2009 at 8:58 AM, Matt Benson wrote: >> >> >> --- On Fri, 9/11/09, Henri Yandell wrote: >> >>> First up would be to cp trunk to a 3.x branch. It's also >>> possible that >>> merging from trunk to the branch may prove easier. >>

[collections] merging collections

2009-09-12 Thread Henri Yandell
On Fri, Sep 11, 2009 at 8:58 AM, Matt Benson wrote: > > > --- On Fri, 9/11/09, Henri Yandell wrote: > >> From: Henri Yandell >> Subject: Re: [collections] generics WAS [jira] Commented: (COLLECTIONS-110)   >> Support parametized classes with commons.collections. >> To: "Commons Developers List"