Re: [matplotlib-devel] How to properly use git to implement a feature

[Michael D. <md...@st...>]

On 08/12/2012 09:34 PM, Daniel Hyams wrote:
>
> I was wanting to add a feature to matplotlib...one that I would use in 
> my application.  I also want to contribute the feature back. I'm 
> personally using version 1.1.1 of matplotlib.  Disclaimer...I only 
> know enough about git to be dangerous.
>
> So is it best to branch from v1.1.1, implement the feature, and then 
> try to rebase to master?  Or is it best to branch from master, 
> implement the feature, and then (somehow) backport the patch to the 
> v1.1.1 tagged version?

If something is a bugfix, I generally branch from v1.1.x (i.e. the 
maintenance branch), implement the feature, submit a pull request for 
that, which eventually gets merged into the maintenance branch. Then I 
merge the maintenance branch into master.  The last step can generally 
only be done by people with write permissions to the core repository.  I 
know other projects that work the other way around, but that's the way 
things have generally been done in matplotlib.

>
> Whatever the best choice is, what would the procedure look like to 
> accomplish this?

git checkout -b my_new_feature upstream/v1.1.x
... implement feature ...
git add ...files...
git commit
git push origin my_new_feature
...create a pull request on github...
...after the pull request is merged, v1.1.x gets merged into master...

Mike

>
> -- 
> Daniel Hyams
> dh...@gm... <mailto:dh...@gm...>
>
>
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
>
>
> _______________________________________________
> Matplotlib-devel mailing list
> Mat...@li...
> https://lists.sourceforge.net/lists/listinfo/matplotlib-devel