Tool offset patch

More
19 Sep 2012 18:09 #24427 by LAIR82
Replied by LAIR82 on topic Re:Tool offset patch
John,

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.

More
19 Sep 2012 18:54 #24428 by BigJohnT
Replied by BigJohnT on topic Re:Tool offset patch
When you open a terminal you are in your home directory. To change the directory you use "cd path to directory". So you need to do "cd linuxcnc-dev" then do a list to see if your file is there with "ls". The git patch command only works in a directory created by git.

Some good reading on basic linux terminal commands here .

John

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

More
20 Sep 2012 12:31 - 20 Sep 2012 12:32 #24451 by LAIR82
Replied by LAIR82 on topic Re:Tool offset patch
Good Morning John,

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.
Last edit: 20 Sep 2012 12:32 by LAIR82.

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

More
20 Sep 2012 12:39 #24452 by BigJohnT
Replied by BigJohnT on topic Re:Tool offset patch
Great to see your making progress.

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.

More
20 Sep 2012 12:47 - 20 Sep 2012 13:57 #24453 by LAIR82
Replied by LAIR82 on topic Re:Tool offset patch
I just tried that, It liked it, then It asked for the password, and when I try to enter my password, it doesn't do anything, the cursor stops blinking, stays solid black as long as I'm trying to type. No letters show up



I talked to my boss and he said that the letters will not show up.
Last edit: 20 Sep 2012 13:57 by LAIR82. Reason: Realized what I needed to do,

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

More
20 Sep 2012 15:02 #24457 by LAIR82
Replied by LAIR82 on topic Re:Tool offset patch
I am having problems applying the patch now, here is what it is saying

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.

More
20 Sep 2012 15:31 #24464 by ArcEye
Replied by ArcEye on topic Re:Tool offset patch
Hi

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.

More
20 Sep 2012 15:41 #24466 by LAIR82
Replied by LAIR82 on topic Re:Tool offset patch
How do get to where i delete it out?

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

More
20 Sep 2012 15:47 #24469 by BigJohnT
Replied by BigJohnT on topic Re:Tool offset patch
Open up the file manager and check off show hidden files then you should be able to see the .git directory.

John

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

More
20 Sep 2012 15:51 #24470 by andypugh
Replied by andypugh on topic Re:Tool offset patch
ArcEye wrote:

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.

Time to create page: 0.145 seconds
Powered by Kunena Forum