Tool offset patch

More
14 years 1 month ago #24484 by BigJohnT
Replied by BigJohnT on topic Re:Tool offset patch
The fellow that made the patch didn't mention what branch it is for... do a "git branch" and tell me what it says.

John

Please Log in or Create an account to join the conversation.

More
14 years 1 month ago #24485 by LAIR82
Replied by LAIR82 on topic Re:Tool offset patch
srt@Cinci:~/linuxcnc-dev$ git branch
* master
srt@Cinci:~/linuxcnc-dev$

Please Log in or Create an account to join the conversation.

More
14 years 1 month ago #24487 by BigJohnT
Replied by BigJohnT on topic Re:Tool offset patch
He might have patched the 2.5 branch so it won't hurt to try.

git am --abort

git checkout -b v2.5_branch origin/v2.5_branch

git branch

then try and apply your patch.

John

Please Log in or Create an account to join the conversation.

More
14 years 1 month ago #24489 by LAIR82
Replied by LAIR82 on topic Re:Tool offset patch
Question John,

In the actual patch, should it have the description in it, or should I delete all that stuff and just leave the code?

Please Log in or Create an account to join the conversation.

More
14 years 1 month ago #24491 by BigJohnT
Replied by BigJohnT on topic Re:Tool offset patch
Yes, there is some info at the top of the file that git uses when it does the patch. So you should not modify the patch.

John

Please Log in or Create an account to join the conversation.

More
14 years 3 weeks ago #24997 by LAIR82
Replied by LAIR82 on topic Re:Tool offset patch
Guys,

I was finally able to get that tool table patch applied to my machine and it is running, time to run some programs and see how she runs.

Thanks again for all the help.

Please Log in or Create an account to join the conversation.

Time to create page: 1.738 seconds
Powered by Kunena Forum