opencog-dev team mailing list archive

["David Hart" <hart@xxxxxxxxxxxx>]

Linas,

I believe I understand your points, however some sets of changes (and some
of those happen to be large sets) are driven by factors that are not
compatible at all times with the idealized workflow outlined in items 1 & 2.

-dave

On Mon, Oct 27, 2008 at 11:30 AM, Linas Vepstas <linasvepstas@xxxxxxxxx>wrote:

> 2008/10/27 Cassio Pennachin <cassio@xxxxxxxxxxxxx>:
>
> >  The
> > merging back to main should be based on stability, not fixed time
> > intervals.
>
> There are two distinct issues, sorry if I clouded them.
>
> 1) Staging should be rebased on main, regularly (e.g. daily)
>
> 2) Code from staging should be merged into main, when
> its "ready", and not on "fixed time intervals"..  However,
> I find it hard to believe that this takes months to accomplish.
> I imagine that there are small changes that can almost
> certainly be merged back  into main every few days,
> or every week or two.  Its been months so far.
>
> > If Joel needs code that's not in staging, it's because whoever wrote
> > that code didn't follow these policies.
>
> I wrote code that I placed into the main branch.  The fact that
> its not in the staging branch tells me that no one is rebasing
> staging on main. I am concerned that main and staging are
> drifting apart, and that there will be large changes between
> these two, and that they will be hard to reconcile.
>
> > I believe one can create a
> > patch for that code, and the developer who wrote it can then merge it
> > with staging and fix incompatibilities.
>
> Yes, but whomever is  contributing to staging has a duty
> to make sure that  they are in sync with main, which is
> what seems to not be happening.
>
> --linas
>
> _______________________________________________
> Mailing list: https://launchpad.net/~opencog-dev<https://launchpad.net/%7Eopencog-dev>
> Post to     : opencog-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~opencog-dev<https://launchpad.net/%7Eopencog-dev>
> More help   : https://help.launchpad.net/ListHelp
>