As most of you know, Ted and John have been doing work to integrate sets
and the new implementation of collections in a branch.
To pick up various repository bug fixes and changes from Andi (as well
as other changes in the app), John has been trying to merge the trunk
into the branch regularly, and has been running into some snags. We met
on IRC this morning (10 am pdt) to come up with a plan to handle this
more efficiently.
* Bear is going to create a new branch off of the trunk, after Phillip
has made a few name changes. John has already moved some of the changes
from the branch to the trunk, and will check in the remaining work after
the new branch is created.
* Bear will use a subversion feature to mark all of the repository with
an 'externals' property. This will cause the branch to use the trunk's
repository, so that the branch picks up any repository changes. We will
use the anonymous checkout URL, so that there's no chance of accidental
branch-to-trunk checkin.
* All changes as part of this effort will be checked in (to the branch
or trunk, depending on what is appropriate). No mailing around patches
applied to different local builds.
* New work related to item collections should be done on the branch,
and/or in coordination with John. If you are touching item collection
code on the trunk, please coordinate with John!
* We'll merge the trunk's changes into the branch daily, at 10 am pdt.
Alec, John, Ted, and others working on the branch or on related code
should be around to help with issues that come up. This will also be a
good time to do a quick sync up to check if anyone is blocked or has
open issues to talk over.
* When the integration is done, we'll merge the branch changes back into
the trunk. After that merge is done, Phillip will proceed with his
flattening project. The integration work is currently scheduled to be
done before the next milestone.
Cheers,
Katie
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
Open Source Applications Foundation "Dev" mailing list
http://lists.osafoundation.org/mailman/listinfo/dev
