Re: [Emc-developers] plasmac

2019-06-27 Thread Phillip Carter
Thanks Chris, I shall begin squashing… Cheers, Phill. > On 28 Jun 2019, at 12:06 pm, Chris Morley wrote: > > In general if there commits that are not so note worthy such as 'WIP' you > probably should squash them. > In my case I squashed almost everything with qtvcp unless I thought it was

Re: [Emc-developers] Good news on RTAI

2019-06-27 Thread Chris Morley
This is good news - thank you Memfob and Andy. Chris M From: andy pugh Sent: June 27, 2019 11:20 PM To: EMC developers Subject: [Emc-developers] Good news on RTAI https://github.com/NTULINUX/RTAI/tree/for-next Many thanks to Memfrob / Neo / Alex whatever name

Re: [Emc-developers] plasmac

2019-06-27 Thread Chris Morley
In general if there commits that are not so note worthy such as 'WIP' you probably should squash them. In my case I squashed almost everything with qtvcp unless I thought it was really important, before I initially added it to master. So I would suggest be ruthless with squashing before putting

[Emc-developers] plasmac

2019-06-27 Thread Phillip Carter
I am ready to push plasmac but before I do should I try to squash it to one commit. There are 440+ local commits and sometime I was a bit lazy with commit comments. Cheers, Phill. ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net

Re: [Emc-developers] Gmoccapy Documentation Links

2019-06-27 Thread Phillip Carter
Thanks Andy, it seemed to have worked… Cheers, Phill. > On 28 Jun 2019, at 9:28 am, andy pugh wrote: > > On Thu, 27 Jun 2019 at 23:40, Phillip Carter wrote: > >> The linuxcnc repo is my upstream repo, so do I just do git push this_branch >> upstream:master > > What I do: > > git push

Re: [Emc-developers] Gmoccapy Documentation Links

2019-06-27 Thread andy pugh
On Thu, 27 Jun 2019 at 23:40, Phillip Carter wrote: > The linuxcnc repo is my upstream repo, so do I just do git push this_branch > upstream:master What I do: git push --dry-run (some output that generally includes abcd1234...3456dcf12) git log -p abcd1234...3456dcf12 (do I see what I

[Emc-developers] Good news on RTAI

2019-06-27 Thread andy pugh
https://github.com/NTULINUX/RTAI/tree/for-next Many thanks to Memfrob / Neo / Alex whatever name he is using now :-) Using this repository I have built an RTAI kernel on 4.14 which works (on a machine that has never worked with RTAI since the Wheezy ISO) andypugh@rm-one:~/linuxcnc-dev/src$

Re: [Emc-developers] Gmoccapy Documentation Links

2019-06-27 Thread Phillip Carter
Thank you, Both gmoccapy.txt and gmoccapy-hu.txt have the same chapter anchor name and a grep of docs/src seems to show no documents requiring a link to gmoccpy-hu. I think it would be safe to rename the anchor in gmoccopy-hu from [[cha:gmoccapy]] to [[cha:gmoccapy-hu]]. I tried it here and all

Re: [Emc-developers] Gmoccapy Documentation Links

2019-06-27 Thread John Thornton
Check that the document anchor is what you expect in the document. https://github.com/LinuxCNC/linuxcnc/blob/master/docs/asciidoc-markup.txt https://github.com/LinuxCNC/linuxcnc/blob/master/docs/src/gui/gmoccapy-hu.txt https://github.com/LinuxCNC/linuxcnc/blob/master/docs/src/gui/gmoccapy.txt