commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Henri Yandell <flame...@gmail.com>
Subject Re: [collections] merging collections
Date Sat, 12 Sep 2009 09:52:38 GMT
On Sat, Sep 12, 2009 at 2:00 AM, Henri Yandell<flamefew@gmail.com> wrote:
> On Fri, Sep 11, 2009 at 8:58 AM, Matt Benson<gudnabrsam@yahoo.com> wrote:
>>
>>
>> --- On Fri, 9/11/09, Henri Yandell <flamefew@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.

Hen

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message