On Wed, Jun 1, 2011 at 6:38 PM, Matthew Brett <matthew.br...@gmail.com> wrote: > Hi, > > On Wed, Jun 1, 2011 at 12:58 PM, Eric Firing <efir...@hawaii.edu> wrote: >>> The current practice worked very nicely with SVN (IMHO), and I think it >> >> (I recall that Mike had to rescue us more than once from svnmerge >> confusions, at least during the earlier days.) > > I was just idly looking at the matplotlib network graph: > > https://github.com/matplotlib/matplotlib/network > > There seem to be lots of branches and cross merges ; the history of > 1.0.x is extremely confusing. > > I wonder whether it would be worthwhile to review git workflow? > > I like Pauli's edits to the numpy gitwash docs in numpy for this. > I've actually just merged these back into the gitwash main docs, > example build here: > > http://matthew-brett.github.com/pydagogue/gitwash/git_development.html > > Maybe the overall point is that git does require some thought to > history, and some rules-of-work, to avoid confusion. > > I've been managing a maintenance branch for my much smaller nibabel > project without much trouble; I've just been doing the occasional > cherry-pick and rebase from trunk for bugfixes.
I have a simpler rule of thumb. When merging work to push to the matplotlib repository: inspect the history graph before the merge, perform the merge locally, and inspect the graph after the merge but before the push. Inspecting the history graph doesn't take long. If the graph doesn't look the way you anticipated (unexplained or unexpected complexity), don't push to the matplotlib repo. If you are unsure or want help, push to your personal fork and post to the mailing list. If you don't know how the history graph should look after the merge, you aren't ready to push that merge to the matplotlib repo. Darren ------------------------------------------------------------------------------ Simplify data backup and recovery for your virtual environment with vRanger. Installation's a snap, and flexible recovery options mean your data is safe, secure and there when you need it. Data protection magic? Nope - It's vRanger. Get your free trial download today. http://p.sf.net/sfu/quest-sfdev2dev _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
