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 can do the merge for you. > > [EMAIL PROTECTED] matplotlib]$ svn update > U lib/matplotlib/ticker.py > U CHANGELOG > Updated to revision 5299. > [EMAIL PROTECTED] 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 > [EMAIL PROTECTED] matplotlib]$ cp > lib/matplotlib/backends/backend_svg.py.working > lib/matplotlib/backends/backend_svg.py > > # Manually resolve texmanager.py > [EMAIL PROTECTED] matplotlib]$ emacs -nw lib/matplotlib/texmanager.py > > # Mark everything as resolved > [EMAIL PROTECTED] matplotlib]$ svn -R resolved . > Resolved conflicted state of 'lib/matplotlib/backends/backend_svg.py' > > # Commit > [EMAIL PROTECTED] matplotlib]$ svn commit -F svnmerge-commit-message.txt > Sending . > Sending CHANGELOG > Sending lib/matplotlib/texmanager.py > Transmitting file data .. > Committed revision 5300. > [EMAIL PROTECTED] 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. Darren ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
