On 2015-01-21 22:05-0000 Phil Rosenberg wrote: > Forgot to mention > As you can imagine this has been rather a large project with many > commits. I have had to make commits on my windows machine then pull > them to my Linux machine, debug, push back, more debugging, etc. for > this reason there are certainly some commits that will not build, > particularly on Linux. I know Alan that you are keen to keep the > history in a state where it will build, but unfortunately when dealing > with this project on multiple platforms I wasn't able to do this. If > this is a problem then we will have to find a way to deal with it, but > I'm not exactly sure how.
I think there is a way to squash all topic branch commits into one or more commits. I believe this topic is covered in the Pro git book. So once everything works properly on your topic branch such a commit squash is worth considering before you merge to master branch. However, the motivation for such squashing is not concern over buildability but instead to emphasize the overview in master branch commits rather than the details of each little change you did on the topic branch. Furthermore, I now think buildability of all commits on master is a "would-be-nice" but not really a major concern (so long as the tip of master builds). For example, I am virtually positive the git bisect method has a way to automatically ignore non-building commits if the script used to test results returns particular numerical exit codes when the build fails. 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 __________________________ ------------------------------------------------------------------------------ New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
