harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tim Ellison <t.p.elli...@gmail.com>
Subject Re: Commit to 5 or 6?
Date Tue, 05 Oct 2010 20:58:56 GMT
On 05/Oct/2010 00:09, Jesse Wilson wrote:
> I'm planning to do some work on the Harmony 6 tests. I'm planning to do
> small improvements: isolating tests for security managers, replace
> assertTrue() with assertEquals(), etc. This work will be driven by me trying
> to get Android's class library passing Harmony's tests as they appear in
> SVN. Currently we only run our own forked copy; that's lame and it doubles
> our maintenance burden.
> In which branch should I commit these changes? If I commit to the Java 5
> branch, then the changes benefit both development trees. I'm not personally
> interested in Java 5 anymore, but I can't speak for everyone. But if I
> commit to the Java 6 branch, I can immediately take advantage of the
> changes. I don't want to think about Java 5 and I'm always running the
> complete set of Java 6 tests.
> Any guidance?

The preferred option, from my POV, is to commit to the 5 branch, and
merge the changes into the 6 branch.  We put fixes and enhancements into
the 5 branch unless they are 6 API specific.  If you only commit to 6
then it will make later merges more complex.


View raw message