On 2015-01-10 14:57-0000 Phil Rosenberg wrote: > Alan - a question about git procedure. We are going to end up in a > situation here where my wxWidget branch that I've already begun is going to > require access to changes made on other branches. I think the only way to > do this is to merge the master branch into my project branch. Does this go > against our git policy
Yes. and will the git hooks on the server accept it? No since that would violate the whole idea behind our adopted rebase git workflow. What you have to do for this situation is stated clearly in README.developers. Never use git merge on a topic branch such as your wxWidget branch to bring it up to date with master changes. That procedure automatically introduces merge commits from master which will ultimately get rejected by the server. Instead use git rebase to bring your development branch up to date with the lastest master branch changes. git rebase effectively saves all your commits on the development branch, deletes them, applies the master commits (via fast-forward), then reapplies your own commits (via fast forward). The overall result of git rebase is your changes to the development branch are merged in a fast-forward manner on top of the tip of the master branch. So the result is no merge commits and no rejection by the server. I have already used git rebase several times without issues in my working branches so I doubt you will have any trouble with it yourself. > > One more question about release dates etc. The wxWidget changes are going > to end up quite extensive. I have already rewritten the wxPLplotWindow > class (removing a diamond inheritance problem) and my intention is to also > remove the Agg backend, the freetype font option and possibly the > wxGraphicsContext backend in favour of the wxGCDC (a wxDC wrapper around > wxGraphicsContext) which will leave us with only one wxWidgets backend > option to maintain. Of course this is a major change to the public API for > the wxWidget driver, it will also require WxWidgets 3.0 (the current driver > requires 2.8), but given that Ubuntu 14.04 include 3.0 in the repos I > assume this won't be much of a problem? My main question is do we want to > depreciate the current API but leave it untouched for this release to give > users some warning or should we just press ahead? Yes. Please just press ahead, but also please test your changes on both Windows and Linux before merging your WxWidgets branch to the master branch. I just checked and epa_build currently builds WxWidgets 3.0 so I should be able to test all your planned changes via epa_build on my Debian stable (a.k.a Debian Wheezy) platform. Of course, Debian Wheezy only officially supports WxWidgets 2.8 so users of that distro (and also most enterprise distros) will need to use epa_build to try out your changes. But that is OK since I think all the rest of the major distros already support WxWidgets 3.0, and a new official release of Debian (Debian Jessie which already supports WxWidgets 3.0) is likely to happen this year if Debian continues its usual pattern that it releases a new official version every two years. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); the Time Ephemerides project (timeephem.sf.net); PLplot scientific plotting software package (plplot.sf.net); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________ ------------------------------------------------------------------------------ Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
