I have been as guilty as anyone at this, but I think it will be good
for us to be careful to keep the branch and trunk in sync vis-a-vis
bugfixes where it makes sense as much as is possible. To date, I have
been fixing them in one place or another and Michael has been doing a
good job merging things in, but we should all try and help him in
these efforts. I have updated the CODING_GUIDE (in the branch and
merged onto the trunk, woohoo!) with instructions. Here they are:
* Keep the maintenance branch and trunk in sync where it makes sense.
If there is a bug on both that needs fixing, use svnmerge.py to
keep them in sync. http://www.orcaware.com/svn/wiki/Svnmerge.py. The
basic procedure is:
- install svnmerge.py in your PATH
- get a svn copy of the branch (svn co
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint)
and the trunk (svn co
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/matplotlib)
- Michael advises making the change on the branch and committing
it. Make sure you svn upped on the trunk and have no local
modifications, and then from the svn trunk do
# where the NNN are the revision numbers. ranges also acceptable
> svnmerge.py merge -rNNN1,NNN2
# this file is automatically created by the merge command
> svn commit -F svnmerge-commit-message.txt
-------------------------------------------------------------------------
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
