On 2015-05-25 17:08-0000 Arjen Markus wrote: > Hi Alan,
> Right, that worked, that is: I updated the repository first, changed to the new branch and then applied my changes. So "git format-patch master" did the trick. I must have overlooked that possibility in the man page - it describes the options in extenso, but I did not see this one. Anyway, the patches are attached. Hi Arjen: I request two changes in the results: 1. Please use the --stdout option to git format-patch. That allows you to store the result in one file rather than a series of them. 2. Base your topic branch on work that is available to me from the SF repository. The reason I mention this is the files you deleted were not clean. They had some local changes you had made before deleting them so that applying the patches here failed. Here is an example, where I edited your deleted file patch to remove all the starting "-" characters so that it should have been identical with the file to be deleted. Instead, I got this diff between the two results: --- /tmp/test_software 2015-05-25 12:34:54.203951576 -0700 +++ bindings/f95/plstubs.h 2015-03-19 15:39:24.030125232 -0700 @@ -194,7 +194,7 @@ #define PLCTIME FNAME( PLCTIME, plctime ) #define PLEND FNAME( PLEND, plend ) #define PLEND1 FNAME( PLEND1, plend1 ) -#define PLENV FNAME( PLENVF95, plenvf95 ) +#define PLENV FNAME( PLENV, plenv ) #define PLENV0 FNAME( PLENV0, plenv0 ) #define PLEOP FNAME( PLEOP, pleop ) #define PLERRX FNAME( PLERRXF95, plerrxf95 ) @@ -241,7 +241,7 @@ #define PLIMAGEFR17 FNAME( PLIMAGEFR17, plimagefr17 ) #define PLIMAGEFR27 FNAME( PLIMAGEFR27, plimagefr27 ) #define PLIMAGEFR7 FNAME( PLIMAGEFR7, plimagefr7 ) -//#define PLINIT FNAME( PLINIT, plinit ) +#define PLINIT FNAME( PLINIT, plinit ) #define PLJOIN FNAME( PLJOIN, pljoin ) #define PLLAB7 FNAME( PLLAB7, pllab7 ) #define PLLEGEND_CNV_TEXT FNAME( PLLEGEND07_CNV_TEXT, pllegend07_cnv_text ) That is you had made a local change to the PLENV definition and commented out the PLINT definition before deleting plstubs.h. I am pretty sure the "git rm" command would have complained about your local uncommitted changes to plstubs.h. The only explanation I can think of is you are basing your current work on top of your previous f95-update work and then using git format-patch to extract just the latest few commits from the long range of commits from that older private work. Instead, you should start fresh and base your private f95_update tree on the current SF version of the master branch and then add your commits to that fresh f95_update tree before sending them to me in git format-patch form. 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 __________________________ ------------------------------------------------------------------------------ One dashboard for servers and applications across Physical-Virtual-Cloud Widest out-of-the-box monitoring support with 50+ applications Performance metrics, stats and reports that give you Actionable Insights Deep dive visibility with transaction tracing using APM Insight. http://ad.doubleclick.net/ddm/clk/290420510;117567292;y _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
