Darren Dale wrote: > On Thursday 29 May 2008 10:59:40 am Michael Droettboom wrote: > >> Darren Dale wrote: >> >>> I'm sorry, I just don't understand how to use this. >>> > > And I'm also sorry for my mild panic attack yesterday. I had way too many > things coming at me all at once. Things are back to normal today. > I know I've been there, and I completely understand. Sorry I was trying to "teach to fish" rather than just "giving you a bloody fish, already" in the midst of that... ;) > >> I can do the merge for you. >> >> [mdroe@wonkabar matplotlib]$ svn update >> U lib/matplotlib/ticker.py >> U CHANGELOG >> Updated to revision 5299. >> [mdroe@wonkabar matplotlib]$ svnmerge merge >> U CHANGELOG >> C lib/matplotlib/texmanager.py >> C lib/matplotlib/backends/backend_svg.py >> >> property 'svnmerge-integrated' set on '.' >> >> # We don't want to merge backend_svg.py -- we just want what's currently >> on the trunk >> [mdroe@wonkabar matplotlib]$ cp >> lib/matplotlib/backends/backend_svg.py.working >> lib/matplotlib/backends/backend_svg.py >> >> # Manually resolve texmanager.py >> [mdroe@wonkabar matplotlib]$ emacs -nw lib/matplotlib/texmanager.py >> >> # Mark everything as resolved >> [mdroe@wonkabar matplotlib]$ svn -R resolved . >> Resolved conflicted state of 'lib/matplotlib/backends/backend_svg.py' >> >> # Commit >> [mdroe@wonkabar matplotlib]$ svn commit -F svnmerge-commit-message.txt >> Sending . >> Sending CHANGELOG >> Sending lib/matplotlib/texmanager.py >> Transmitting file data .. >> Committed revision 5300. >> [mdroe@wonkabar matplotlib]$ >> > > Thanks for posting this. I'll take a sweep through the bug tracker this > weekend, and see if I can do this myself. I'll be working on documentation > this weekend, I'll add a section on merging to the documentation once I can > do it on my own. > There is a little blurb on merging already in the coding guidelines, but it would be great to have it expanded by someone while it's still a fresh experience. FYI: I have a little time today to do some documentation work myself today. I've been doing some minor edits (mostly formatting things) on the developer docs, and then was going to hit up the user docs. Does that step on your toes / duplicate effort? Anywhere where you think I would be more useful? Mike -- Michael Droettboom Science Software Branch Operations and Engineering Division Space Telescope Science Institute Operated by AURA for NASA