denise: Image: Me, facing away from camera, on top of the Castel Sant'Angelo in Rome (Default)
Denise ([staff profile] denise) wrote in [site community profile] dw_dev2010-09-22 05:38 am
Entry tags:

hg update -C tip

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.)