On 2015-02-15 23:04-0500 Jim Dishaw wrote:
> I think I successfully got my master updated and rebased my branch. I have
> attached a patch that captures my work relative to the current master. I
> really hope this patch works without conflicts!
Please use the correct term which is "patch series" or commit series
since I think there will be less mistakes and a cleaner mental model
of what is going on if the correct terminology is used.
I don't think your present patch series really captures what you want
to do. The various patches have the following titles:
Subject: [PATCH 1/7] Changed the if logic for PLSTATE_CMAP0 and PLSTATE_CMAP1
Subject: [PATCH 2/7] Added obsolete commands to plbuf_control to attempt some
Subject: [PATCH 3/7] Fixes to preserving state information in the plot buffer
Subject: [PATCH 4/7] New plmeta implementation
Subject: [PATCH 5/7] Revisions to plot metafiles * Added free() of memory
Subject: [PATCH 6/7] Corrected some comments to better explain what the code
Subject: [PATCH 7/7] More progress on implementing the new plmeta driver
But if you look in the log of the current master branch (which I
suggested you should do), we find the first 4 titles.
764297d Changed the if logic for PLSTATE_CMAP0 and PLSTATE_CMAP1 that
puts both the empty colormap and too small colormap cases into one
block. This eliminates duplicative code.
2301119 Added obsolete commands to plbuf_control to attempt some
backwards compatabilty with old plot metafiles.
92896be Fixes to preserving state information in the plot buffer
c81183a New plmeta implementation
It does appear like you attempted to rebase rather than starting fresh
because now your first patch has degenerated to a one-line whitespace
change which is probably not allowed by our uncrustify styler in any
case. Of course, the
the commit message for that first patch corresponds to your original
patch so is not suitable to describe that one-line change even if
that what you really wanted to change.
Furthermore, that rebase was not perfect;
your second patch inserts the rdbuf_eop routine into code that already has it in
master and also has a unresolved conflict symbol >>>>>>>>,
your third patch removes that code again (which I doubt you want
to do), and your fourth patch inserts WritePageInfo and
UpdatePrevPagehdr routines into a file that already has that logic.
So your first four patches would not apply and are likely not
useful in any case because that work from you has already been
commited to master (and changed later with the style changes). So I
ignored those patches. That leaves the final 3 patches in the series
Subject: [PATCH 5/7] Revisions to plot metafiles * Added free() of memory
Subject: [PATCH 6/7] Corrected some comments to better explain what the code
Subject: [PATCH 7/7] More progress on implementing the new plmeta driver
which apparently do represent actual development work you have done
since your previous series went into master.
However, on their own they did not apply cleanly. The style change
normally simply only changes whitespace so I also tried
git am --interactive --ignore-space-change --ignore-whitespace \
~irwin/Jim.Dishaw/20150215/plbuf_plmem.patch
while ignoring the first four patches in your series, but the first of
the above 3 still failed to apply with the following messages
Commit Body is:
--------------------------
Revisions to plot metafiles * Added free() of memory allocated to metafile
names * Update to test_plbuf
--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Revisions to plot metafiles * Added free() of memory allocated to
metafile names * Update to test_plbuf
/home/software/plplot/HEAD/plplot.git/.git/rebase-apply/patch:94: trailing
whitespace.
// Set the y-axis to 5 digits maximum and generate the plot for
error: patch failed: examples/c/test_plbuf.c:67
error: examples/c/test_plbuf.c: patch does not apply
Patch failed at 0005 Revisions to plot metafiles * Added free() of memory
allocated to metafile names * Update to test_plbuf
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Anyhow, as I said before I think your best best is simply to start
with a topic branch that is branched off from current master tip and
regenerate what you have done in those 3 last patches to form a
revised 3-patch series for us to evaluate.
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
