On 2015-05-25 12:38-0000 Arjen Markus wrote:
> Hi Alan,
>
>
>
>> -----Original Message-----
>> From: Alan W. Irwin [mailto:ir...@beluga.phys.uvic.ca]
>>
>> Of course, if I am going to contribute to this development I do need git
>> access to your
>> private topic branch work using the usual "git format-patch" and "git am"
>> method that
>> is described in README.developers. So for now I suggest your first priority
>> would
>> be to present exactly what you have given us here as a tarball in "git
>> format-patch"
>> form instead with no further changes (except possibly not including the
>> x00f.f90
>> change since I would just revert that, see above). And that solid git start
>> with just
>> your present work and no further except possibly excluding the x00f.f90
>> change
>> would allow us to develop this private topic from there. Of course, I am
>> aware you
>> have had some problems with using "git format-patch" in the past, but if
>> those
>> continue let me know here or off list, and I think I should be able to give
>> you an exact
>> cookbook of what to do to get started.
>>
> I must be overlooking something, because whatever I do with "git
> format-patch" it invariably produces no patch at all.
>
> I have made my changes on a separate branch, tried to produce a patch file
> (nothing happened) committed them to the local repository
> and tried to produce a patch file (nothing continued to happen).
Hi Arjen:
I assume from what you said above that your current situation is a
master branch (presumably the same as the one at SF, but if you are
behind in updating that with the SF variant it doesn't matter) and
private branch (let's call it f95update) that is identical to the
master branch except that the f95update branch has some extra commits.
To verify that situation use the "git log --oneline" command, e.g.,
git log --oneline -4 master
git log --oneline -7 f95update
which respectively show the last 4 commits in master and
last 7 commits in f95update where you specified 7 because
you were pretty sure there were 3 extra commits in the f95update branch.
So let's assume those commands show you that your situation is
master: ... A-B-C
\
f95update: D-E-F
where D-E-F are the extra commits you want to package with
format-patch.
Then from "git help format-patch" I would try
git checkout f95update
git format-patch master
where "master" refers to the commit ID C at the tip of the master
branch where you branched f95update from master.
For a more complicated example, suppose you have kept up with
ordinary development from the rest of us and updated the master
branch after you created f95update.
Then the situation has changed to
master: ... A-B-C-R-S-T-U-V-W-X-Y-Z
\
f95update: D-E-F
In this case to collect D-E-F in a format patch you simply run
git checkout f95update
git format-patch D^
where D^ is notation for the ancestor of D which is the same as C. Or
you also have the option of rebasing so you end up effectively with
master: ... A-B-C-R-S-T-U-V-W-X-Y-Z
\
f95update: G-H-I
where I have used different letters for the 3 extra commits to show
that the rebase has changed those commits (since each commit refers to
a complete file system snapshot) from what they were before. But in
this case
git checkout f95update
git format-patch G^
would give you the same patch file (except for the commit identity
associated with each of the 3 commits) that you produced before.
I hope these examples help to clarify what goes on with git
format-patch, but the principal message I want you to take away from
this is always to use "git help <commandname>" first whenever you are
having trouble figuring out the syntax of some git command.
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
