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 That cherry-pick command can go two ways. Either it will succeed and commit the changes from a36f3aa4 to your 2.7 and everything is fine, or it can have a merge conflict and stop with the changes half-applied. *If* it has a merge conflict you'll have to resolve the situation by hand. Use `git status` to see what files had conflicts, and edit them to fix all the problems. Use `git add file.c` to mark them as resolved when you're done. Build and test if you're feeling like a responsible adult. Then `git commit` to finalize the result. Then, once the cherry-picking is all done, push your updated 2.7 branch to glo: > git push origin 2.7 -- Sebastian Kuzminsky ------------------------------------------------------------------------------ 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 [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
