On Thu, Oct 8, 2009 at 4:23 PM, Mark Hindess <mark.hind...@googlemail.com>wrote:
> If I was in your position I'd probably try to: > > 1) Revert the author removal or justify why I thought it made sense > to the upstream and do it in one big change. It looks like you > are doing this with HARMONY-6348 but I think some discussion needs > happen on the list. I'll stop talking about it and kick this off. > > 2) Revert the whitespace changes or justify why they should be made > upstream and do them in one big change. > > 3) Create a JIRA with a patch for all the spelling corrections. > > 4) Start creating focused patches for the remaining changes in order of > importance. > Sounds like a plan! I'll try to get started on 2) and 3) shortly... As I hinted before there is another issue that concerns me. You could > probably make more progress as a committer. I tend to favour committers > that have made JIRA patches as I'd hope to see them make commits rather > than just hope that monolithic patches wont just translate in to > monolithic commits if they had commit access. (This is not the only > factor or even a deciding one.) > > I don't know whether you'd like to be a committer or not but selfishly > it would suit me as I'd not have to apply any more of your patches. ;-) > Well, on the projects that I do have commit privileges, I tend to submit patches in logical units. Sometimes one logical unit is large but uninteresting (whitespace, refactorings) and sometimes it's small and interesting. For Harmony, I'm really just trying to address the multi-year gap between Android and Harmony, and this project just lends itself to larger patches. Once we're caught up (I'd like to have done so in 4-8 weeks), patch sizes should come back to normal. > Aside: Out of curiosity do you have a feel for how much progress you've > made getting your changes upstream and how much is still to go? > There have been three phases... 1. Promoting Android Javadoc upstream to Harmony. It was a big project, but not particularly uninteresting or technically challenging. 2. Pulling Harmony changes into Dalvik. This is 90% done; the only outstanding modules are nio and nio_char. I've done most of the merge, but I got slightly hung up on the selector change. 3. Pushing Dalvik changes into Harmony. This is 20% done, but I'm quite happy with progress thus far. So yeah I think in 4-8 weeks, Dalvik and Harmony will be fully in sync. I've written some scripts for pushing code back and forth between the two projects. That should make it easy to stay up-to-date once we get there.
