[
https://issues.apache.org/jira/browse/MATH-1290?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15233533#comment-15233533
]
Rob Tompkins edited comment on MATH-1290 at 4/9/16 12:48 PM:
-------------------------------------------------------------
I see Gilles, you are looking for the least invasive procedure to merge the
changes in. Before I go into how to do the merge in the least invasive way
possible, let me give a brief description of my understanding of the mechanics
beind "git's" {{pull}} command. I think it's fundamentally a {{git fetch}}
followed by a {{git merge}}. For this to happen we still need a reference to
the remote repository in question as well as the individual branch in question.
That said, I would perform the following steps again assuming that the branch
to which we wish to merge is named develop (but it need not be):
{code}
git clone git://git.apache.org/commons-math.git
cd commons-math
//<<have done standard work and now want to merge in the pull request from a
branch named feature-MATH-1290>>
git remote add ericbarnhill https://github.com/ericbarnhill/commons-math.git
git fetch ericbarnhill feature-MATH-1290
//<this creates a single new remote branch reference, namely
remotes/ericbarnhill/feature-MATH-1290>>
//<<I would still want a local copy for the sake of making changes so the below
still applies>>
git checkout -b feature-MATH-1290 ericbarnhill/feature-MATH-1290
//<<Make and commit any needed changes to the branch here>>
git checkout -b develop origin/develop
git merge feature-MATH-1290
//<<This should open vi and allow a commit message>>
git push origin develop
//<<now suppose I want to remove all references to Eric's repository, I would
perform the following>>
git branch -D feature-MATH-1290
//<<this deletes my local copy of the fetched remote reference branch>>
git remote rm ericbarnhill
//<<this deletes my remote reference to Eric's repository, leaving me back in
my previous state only with feature-MATH-1290 now merged in>>
{code}
GitHub has the mechanics in place in it's online user interface to do a pull
request with a click of a button, but I think under the hood it performs the
exact commands above or if not something extremely similar.
was (Author: chtompki):
I see Gilles, you are looking for the least invasive procedure to merge the
changes in. Before I go into how to do the merge in the least invasive way
possible, let me give a brief description of my understanding of the mechanics
beind "git's" {{pull}} command. I think it's fundamentally a {{git fetch}}
followed by a {{git merge}}. For this to happen we still need a reference to
the remote repository in question as well as the individual branch in question.
That said, I would perform the following steps again assuming that the branch
to which we wish to merge is named develop (but it need not be):
{code}
git clone git://git.apache.org/commons-math.git
cd commons-math
//<<have done standard work and now want to merge in the pull request from a
branch named feature-MATH-1290>>
git remote add ericbarnhill https://github.com/ericbarnhill/commons-math.git
git fetch ericbarnhill feature-MATH-1290
//<this creates a single new remote branch reference, namely
remotes/ericbarnhill/feature-MATH-1290>>
//<<I would still want a local copy for the sake of making changes so the below
still applies>>
git checkout -b feature-MATH-1290 ericbarnhill/feature-MATH-1290
//<<Make and commit any needed changes to the branch here>>
git checkout -b develop origin/develop
git merge feature-MATH-1290
//<<This should open vi and allow a commit message>>
git push origin develop
//<<now suppose I want to remove all references to Eric's repository, I would
perform the following>>
git branch -D feature-MATH-1290
//<<this deletes my local copy of the fetched remote reference branch>>
git remote rm ericbarnhill
//<<this deletes my remote reference to Eric's repository, leaving me back in
my previous state only with feature-MATH-1290 now merged in>>
{code}
GitHub has the mechanics in place in it's online user interface to do a pull
request with a click of a button, but I think under the hood it performs the
exact commands what I have done above or if not something extremely similar.
> Additions to Complex Utils; creation of conversion methods between Complex[],
> double[], float[], and interleaved arrays
> -----------------------------------------------------------------------------------------------------------------------
>
> Key: MATH-1290
> URL: https://issues.apache.org/jira/browse/MATH-1290
> Project: Commons Math
> Issue Type: Improvement
> Affects Versions: 3.5
> Reporter: Eric Barnhill
> Priority: Minor
> Labels: newbie, patch
> Fix For: 4.0
>
> Attachments: ComplexUtils.java, ComplexUtils.java, ComplexUtils.java,
> ComplexUtils.java, ComplexUtilsTest.java, ComplexUtilsTest.java,
> ComplexUtilsTest.java, ComplexUtilsTest.java, LaguerreSolver.java
>
> Original Estimate: 24h
> Remaining Estimate: 24h
>
> I propose to add several new methods to the ComplexUtils class enabling easy
> conversion between Complex[] arrays, real or imaginary double[] or float[]
> arrays, and interleaved complex double[] or float[] arrays. The last two in
> particular are beneficial to have for OpenCL implementations and the
> JTransforms library.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
