hg update -C tip

[denise]

So, a while ago, we closed the 'production' branch in Mercurial. Since then, i've been merrily going along with my 'hack, updating my code regularly, yadda, except for some reason I kept having problems applying patches from the review queue...

...many of you can probably figure out where this is going. So, tonight I was having some trouble with S2 changes in dw-nonfree making my update script error out and die, and Afuna and I realized, finally, that it was because I was still set to the 'production' branch in Mercurial. So, if you're like me and keep having problems applying patches, try this:

hg id

If it says 'production', do this:

hg update -C tip


(When I did that, I got "427 files updated, 0 files merged, 28 files removed, 0 files unresolved". Yowch.)

Code tour, 2010 September 15 to 2010 September 21

[azurelunatic]

A code tour! Oh boy! 13 bugs this week, including eight new themes. Most of these are waiting on the next code push, but a few of them (like site text changes) are live now. This week we have patches from kareila, allen, denise, liv, fu, ninetydegrees, and sarken. Thank you very much to all the contributors, patch and otherwise.

( Bugs and other patches )

( New themes )