Tool offset patch
- LAIR82
- Offline
- Platinum Member
-
- Posts: 336
- Thank you received: 9
I hope your not getting irritated,
Here is what I get when I try to apply the patch, and How do I change directories,
srt@Cinci:~$ git clone git://git.linuxcnc.org/git/linuxcnc.git linuxcnc-dev
Initialized empty Git repository in /home/srt/linuxcnc-dev/.git/
remote: Counting objects: 110912, done.
remote: Compressing objects: 100% (25444/25444), done.
remote: Total 110912 (delta 87482), reused 107589 (delta 84515)
Receiving objects: 100% (110912/110912), 59.80 MiB | 235 KiB/s, done.
Resolving deltas: 100% (87482/87482), done.
srt@Cinci:~$ git am --signoff tool-change.patch
fatal: Not a git repository (or any of the parent directories): .git
srt@Cinci:~$ git am --signoff 0001-Fanuc-style-tool-change-for-Lathes.-On-Fanuc-control.patch
fatal: Not a git repository (or any of the parent directories): .git
srt@Cinci:~$
Please Log in or Create an account to join the conversation.
- BigJohnT
-
- Offline
- Administrator
-
- Posts: 7000
- Thank you received: 1175
Some good reading on basic linux terminal commands here .
John
Please Log in or Create an account to join the conversation.
- LAIR82
- Offline
- Platinum Member
-
- Posts: 336
- Thank you received: 9
I sat down and read thru the manuals you sent along with what I found about git and linuxcnc-git and am feeling a little better about what I'm doing, problem I am having is that I missed a step about checking for outstanding build dependencies, I did that step now, and I have some things need to get installed. I try to install and here is what I get;
srt@Cinci:~/linuxcnc-dev$ apt-get install dvipng
E: Could not open lock file /var/lib/dpkg/lock - open (13: Permission denied)
E: Unable to lock the administration directory (/var/lib/dpkg/), are you root?
srt@Cinci:~/linuxcnc-dev$ sudo -i
[sudo] password for srt:
I entered the sudo -i and then it will not allow me to type to enter our password.
Please Log in or Create an account to join the conversation.
- BigJohnT
-
- Offline
- Administrator
-
- Posts: 7000
- Thank you received: 1175
Anytime you use a command that requires root privileges you precede the command with sudo.
sudo apt-get install dvipng
will prompt you for your password then proceed to install the package.
John
Please Log in or Create an account to join the conversation.
- LAIR82
- Offline
- Platinum Member
-
- Posts: 336
- Thank you received: 9
I talked to my boss and he said that the letters will not show up.
Please Log in or Create an account to join the conversation.
- LAIR82
- Offline
- Platinum Member
-
- Posts: 336
- Thank you received: 9
srt@Cinci:~/linuxcnc-dev$ git am --signoff 0001-Fanuc-style-tool-change-for-Lathes.patch
previous rebase directory /home/srt/linuxcnc-dev/.git/rebase-apply still exists but mbox given.
srt@Cinci:~/linuxcnc-dev$
Please Log in or Create an account to join the conversation.
- ArcEye
- Offline
- Junior Member
-
- Posts: 24
- Thank you received: 758
I find git very aptly named sometimes! It can be very frustrating.
The answer I believe is to delete the rebase-apply directory which is inside the hidden .git directory in the root of the file tree.
regards
Please Log in or Create an account to join the conversation.
- LAIR82
- Offline
- Platinum Member
-
- Posts: 336
- Thank you received: 9
Please Log in or Create an account to join the conversation.
- BigJohnT
-
- Offline
- Administrator
-
- Posts: 7000
- Thank you received: 1175
John
Please Log in or Create an account to join the conversation.
- andypugh
-
- Offline
- Moderator
-
- Posts: 23377
- Thank you received: 4966
I find git very aptly named sometimes! It can be very frustrating.
The answer I believe is to delete the rebase-apply directory which is inside the hidden .git directory in the root of the file tree.
It might be worth trying:
git reset --hard origin/master
(or origin v2.5_branch if that is the branch you are patching)
Please Log in or Create an account to join the conversation.