opencog-dev team mailing list archive

["Linas Vepstas" <linasvepstas@xxxxxxxxx>]

2008/10/28 Ben Goertzel <ben@xxxxxxxxxxxx>:
>
> Egads!!!
> I go offline for one day and this is what happens???  ;-)

Heh.

The term is "snafu", in english. Gama wrote an email
last night that basically says "he fucked up and he wants
me to fix it."  He he wants me to merge two branches
into one; into the staging branch.  Doh! Right idea, but
the wrong branch. The staging branch needs to be nuked
out of existence; its based on a broken idea that got us
into this mess, and trying to stick to this broken idea
will *NEVER* get us out of this mess!

To be clear: UNTIL THE CODE HAS BEEN PLACED
INTO THE MAIN BRANCH, IT DOESN'T MEAN MUCH.
Continuing to work out of some other branch is pointless
and stupid; it will only cause the problem to repeat itself,
over and over!  Clearly, by now this is obvious and
self-evident?

If you want me to be your knight in shining armour,
and get you out of this mess, then we are going to
have all new policies.

Policy part one: from now on, developers will sync
their branches DAILY, or as often as possible.
NO MORE DIVERGENCES!

Policy part two: Developer branches will NOT BE
CONSIDERED FOR MERGING UNTIL THEY ARE
SYNCED!

These are two very small and very simple rules.  If you
stick to them, they will work. If you create a plethora of
new branches, as has been done, things will fail. Again.

I will be merging INTO THE MAIN BRANCH. Clear on this?
It will take a few days, I figure.

After that EVERYONE MUST REBASE ONTO THE
MAIN BRANCH!  Which shouldn't be hard, because
it will look just like staging. If there are any further problems,
contact me, I'm right here, reachable by email or by IRC.

Capiche?

--linas