On Sat, Sep 12, 2009 at 7:26 AM, Rahul Akolkar<rahul.akol...@gmail.com> wrote: > On Sat, Sep 12, 2009 at 5:52 AM, Henri Yandell <flame...@gmail.com> wrote: >> On Sat, Sep 12, 2009 at 2:00 AM, Henri Yandell<flame...@gmail.com> wrote: >>> On Fri, Sep 11, 2009 at 8:58 AM, Matt Benson<gudnabr...@yahoo.com> wrote: >>>> >>>> >>>> --- On Fri, 9/11/09, Henri Yandell <flame...@gmail.com> 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. >>>> >>>> Damn it, Hen--that's part of the debate I wanted to save for a new thread! >>>> ;) >>> >>> I took a quick look. First up we should unify the license headers. >>> Change trunk to not have two spaces after the comment. That's causing >>> a lot of clashes. Once that's done I think it'll look nicer. >> >> That's cleaned up. Definite drop in the number of clashes. A lot of >> deletes to understand too. >> >> Current status: >> >> 65 deletes. >> 342 adds/modifies. >> 85 clashes. >> > <snip/> > > Kudos for taking this on. By the by, WRT r814123, r814126 and hair > splitting :-), the correct placement of the URL in the license header > is 4 spaces to the right of the rest of the header text's indent.
Yeah... more interested in getting them the same than correct :) Getting closer, down to 30 clashes. The ones that require more thinking sadly. Hen --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org