[Cosmo-dev] To merge, or not to merge...

[Ted Leung]

On Mar 27, 2007, at 4:46 PM, Brian Moseley wrote:

> this is yet another reason why 0.6.1 development should have moved
> back to the trunk as soon as 0.6.0 was released.

There are several factors for why we are in the current situation.

1. Cosmo 0.6.1 was not supposed to go this long - it looks like it  
will go several more weeks, because we will not release until we've  
had several rounds of interop testing with Chandler.   So really, you  
could almost look at 0.6.1 as 0.7 - which is why I agree that merging  
it back to the trunk is now the sensible thing to do.
2. We were not at all sure that we were going to do the dashboard,  
and we thought that we were going to make a bunch of dogfood related  
changes which needed to be in 0.7 if the dashboard ended up not  
making it.    Now it looks like we are going to have enough time to  
finish the dashboard, so the need to separate that stuff is less.

In any case, yes, I agree that we should merge 0.6.1 back to the  
trunk.  Actually, we never should have called it 0.6.1 to begin  
with.  But hindsight is always 20/20.

Ted