Jan de Kruyf pravi:
> This is a feature of git.
> Git wants strict white space, but somehow the patch generation does not
> always give
> strict whitespace
> The solution for me is to extract the patch from the mail and apply it
> manually with
> patch -l or --ignore-whitespace. (see the patch manpage)
>
> j.
>
Huh....
I'm simply to dumb to do that. :(
Maybe It helps if I told that I use linux and emc near 14 days!
patch --help says nothing about --ignore-whitespace ?!?!?
Can you provide me exact commandline?!
I have downloaded package into users/slavko/emc2-dev
in same place is "smdi.eml" email with patch.
As I understand I must strip out garbage from that patch. Where garbage
ends?!
In commit or diff line?!? (or somewhere else)
thanks
commit 314f3aa2d90e5ec1f7840166f3e0ad11a9fbc0a6
Author: Jeff Epler <jep...@unpythonic.net>
Date: Wed Jan 27 08:16:47 2010 -0600
improve behavior of MDI O-calls
Bad things happen when the motion id is zero. This could frequently
happen when doing O-calls from MDI, because the motion ids for an MDI
start at pseudoMdiLineNumber and increase for each executed motion
(? line?) in the subroutine. For instance, if pseudoMdiLineNumber was
-7, then executing an O-call with 8 or more lines of motion would issue
a motion with ID 0.
diff --git a/src/emc/task/emctaskmain.cc b/src/emc/task/emctaskmain.cc
index 39ce8ad..f26c1cf 100644
--- a/src/emc/task/emctaskmain.cc
+++ b/src/emc/task/emctaskmain.cc
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Emc-users mailing list
Emc-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-users
