[Cosmo-dev] 0.6 model changes on a branch

[Brian Moseley]

On 11/15/06, Randy Letness <randy at osafoundation.org> wrote:
> I've been making changes and making sure tests (functional/unit) keep
> passing.  I would never check in anything that would break the trunk.

yes, but we'll have to make changes like updating dav to use
EventStamp rather than CalendarEventItem. i'm scheduled to do that
particular work, which means you'd have to figure out some way to make
the dav code compile and pass tests until i get to my part of the job.
whereas if we do the work on a branch, there's no need for the code to
compile or pass tests, and it can sit around until i'm ready to work
on it. same for bobby's rpc stuff.

> Also, when would we merge(because there is a lot of work to be done)?  I
> can foresee problems after the merge to work out kinks with new stuff on
> the trunk, and additional changes being done after the merge.  It just
> seems like extra work, but if it will help others out then I'm game for
> anything.

we'd merge when the majority of the work is done, like last time.
hopefully in the next 2-3 weeks, since these turbulent changes are
being addressed at the front of the schedule rather than the back.