Hi,

I just followed the procedure below to merge a patch I did on mplot3d
(R7446 on v099). However, a lot more stuff got merged and sent as I
did this (R7447). I hope I did not break anything!

Regards,
Reinier

On Fri, Jul 31, 2009 at 3:57 PM, Michael Droettboom<md...@stsci.edu> wrote:
> A 0.99 branch has been created at:
>
>  https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint
>
> This is where the first 0.99.0.rc1 release candidate and binary releases
> will be made from this weekend.
>
> All potentially disruptive or experimental changes should be made only
> to the trunk.
>
> *All bug fixes should be made to the branch, and then merged into the
> trunk.*  You will need to have svnmerge.py installed.  The workflow for
> this is as follows:
>
> 1. Check out the branch, if you haven't already:
>
>  svn co
> https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint mpl99
>
> 2. Make/test bugfixes on your working copy of this branch
>
> 3. Commit your changes on this branch
>
> 4. 'cd' to your working copy of the trunk
>
> 5. Merge the changes from the branch into the trunk:
>
>  svnmerge.py merge -S v0_99_maint
>
> 6. Resolve any conflicts, install, and test the merge.
>
> 7. Commit the merged changes to the trunk:
>
>  svn commit -F svnmerge-commit-message.txt
>
>
> Let me know if you have any questions.
>
> Mike
>
> --
> Michael Droettboom
> Science Software Branch
> Operations and Engineering Division
> Space Telescope Science Institute
> Operated by AURA for NASA
>
>
> ------------------------------------------------------------------------------
> Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
> trial. Simplify your report design, integration and deployment - and focus on
> what you do best, core application coding. Discover what's new with
> Crystal Reports now.  http://p.sf.net/sfu/bobj-july
> _______________________________________________
> Matplotlib-devel mailing list
> Matplotlib-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
>



-- 
Reinier Heeres
Tel: +31 6 10852639

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Matplotlib-devel mailing list
Matplotlib-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-devel

Reply via email to