[Cosmo-dev] 0.6.1 -> trunk merge details

[Matthew Eernisse]

Actually after building the app, it appears that the merge has 
overwritten the new button styling in the trunk with the older code from 
0.6.1. Other bugfix changes changes I made seem to have been reverted as 
well.

Was that supposed to happen?

I'm going back to try to figure out which changes got blown away, and 
put things back the way they were.


M.

Travis Vachon wrote:
> Hi folks
> 
> Because we have decided to move 0.6.1 work to the trunk, "0.6.1" (that 
> is, the head of trunk) now has some additional work from the past couple 
> months.
> 
> Off the top of my head, this work includes:
>    * New button styling
>    * Password recovery workflow (complete except for UI, which should be 
> pretty minimal)
>    * Windmill
>    * Assorted bug fixes
> 
> A couple questions this raises:
> 
> 1) Do we need to go through the list of commits to trunk and modify the 
> corresponding bugzilla entries accordingly in for the purposes of QA?
> 2) Should we include these features in the list of 0.6.1 features when 
> we release? (if so, 1 is probably a yes, correct?)
> 3) What other side effects does this have?
> 
> One reasonably major side effect I can think of is related to bug 8460:
> https://bugzilla.osafoundation.org/show_bug.cgi?id=8460
> 
> Since the "forgot password" model work is now part of 0.6.1, we'll need 
> additional migration script work, I believe. Fortunately, I think this 
> should be reasonably simple, since all we need is a single additional 
> database table.
> 
> Thoughts?
> 
> -Travis
> _______________________________________________
> cosmo-dev mailing list
> cosmo-dev at lists.osafoundation.org
> http://lists.osafoundation.org/mailman/listinfo/cosmo-dev
>