On 03/11/2017 11:50 AM, Sebastian Kuzminsky wrote:
> On 03/10/2017 08:46 PM, Jon Elson wrote:
>> On 03/06/2017 10:48 PM, Jeff Epler wrote:
>>> On Mon, Mar 06, 2017 at 08:33:56PM -0600, Jon Elson wrote:
>>>> Great, it works! Thanks for the quick fix!
>>> Thanks for verifying the fix.
>>>
>>>
>> OK, now that I've verified that my fix to hal_ppmc fixes the
>> original problem with PCIe parport cards, I wonder if we
>> should backport that to 2.7? It is this commit :
>>
>> a36f3aa41b21098645c84631055db73136c77515
>>
>> Which seems to only have been merged to master at this time.
>>
>> I could do it if somebody gives me EXACT instructions, but
>> I'm a real novice at git.
> Here's how I would do it:
>
> # go into your linuxcnc git directory
> > cd linuxcnc-dev
>
> # fetch all updates from git.linuxcnc.org
> > git fetch origin
>
> # check out the 2.7 branch that you want add the commit to
> > git checkout 2.7
>
> # move your 2.7 branch forward to the current state of 2.7 from glo
> > git merge --ff-only origin
>
> # and finally apply that commit from master:
> > git cherry-pick a36f3aa41b21098645c84631055db73136c77515
>
>
Thanks for the detailed instructions! I got all the way to
the cherry-pick command, and then got this:
elson@jeuspace:~/linuxcnc-dev$ git cherry-pick
a36f3aa41b21098645c84631055db73136c77515
# On branch 2.7
# Your branch is ahead of 'origin/2.7' by 1380 commits.
#
nothing to commit (working directory clean)
The previous cherry-pick is now empty, possibly due to
conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset'
_____________________
Not too sure what went wrong, can you suggest what to do to
fix it? hal_ppmc.c should be only slightly different on 2.7
and 2.8, besides my recent patch, there have been no changes
since 2013, and Jeff already merged his change to the hal
command line function.
Thanks very much,
Jon
------------------------------------------------------------------------------
Announcing the Oxford Dictionaries API! The API offers world-renowned
dictionary content that is easy and intuitive to access. Sign up for an
account today to start using our lexical data to power your apps and
projects. Get started today and enter our developer competition.
http://sdm.link/oxford
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
