On 2015-02-15 21:15-0500 Jim Dishaw wrote: > Did the patch I sent earlier work?
The last I saw from you was the patch (actually a patch series) you sent 3 days ago. That got into the integrated series by Phil (which worked, which I think answers your question). Because that worked, Phil pushed that integrated series to master, and I followed up with the visibility fix for test_plbuf and with a large and intrusive patch to style all the recent changes. To repeat what I said before, please make sure you are subscribed to the git feed so you know all about the latest git activity for our SF repo such as the big push from Phil and my latest changes as well. But for the sake of argument let's say you haven't been paying attention to that feed. Then to confirm exactly what is in the latest master do the following: # Update your local master to be consistent with the SF version git checkout master #if not already there git fetch git merge --ff-only origin/master # Find out list of commits (in reverse chronological order) that are (now) in your local master branch git log --oneline |less Your series of commits should be about 60th on that list because Phil's integrated patch series had a lot of commits after yours. If you want lots of details about each of those commits, drop the --oneline option. Then create a fresh topic branch from that updated local master branch, and proceed from there with any changes after the last commit from you that got into master and any subsequent changes to plbuf that Phils commit series did or my subsequent commits did. Note, a lot of what I say about the appropriate git commands to use has already been documented in README.developers. So consult that file first if you have questions about what I said above, but once you have consulted that file I would be happy to answer further questions concerning git. 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 __________________________ ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
