John Hunter wrote: > Hey Michael, > > I recently committed a pyplot patch for the switch_backends > functionality, and when I went to svnmerge it I go the changes for > your backend_agg fix. Since I would rather let you handle these, what > is the best way to back out of the situation I am in. I guess what I > would like to do is > > * ignore the backend_agg changes on my end > > * just merge the pyplot changes > > * not screw anything up that you are doing and preserve the merge for you > > What is the best way to proceed in this situation? > None of those _backend_agg.cpp changes apply to the trunk. Just replace _backend_agg.cpp with _backend_agg.cpp.working and commit. (Or I can do that...)
Cheers, Mike Michael Droettboom Science Software Branch Operations and Engineering Division Space Telescope Science Institute Operated by AURA for NASA ------------------------------------------------------------------------- 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
