sorry - add this to emc2-dev/.git/config to add mah as a remote repository:
---
[remote "mah"]
fetch = refs/heads/*:refs/remotes/mah/*
url = git://git.mah.priv.at/emc2-dev.git
---
-m
Am 09.01.2012 um 17:37 schrieb John Thornton:
> The first two worked ok but the third one gave me
>
> fatal: 'mah' does not appear to be a git repository
> fatal: The remote end hung upo unexpectedly
>
> I did a git branch -a but didn't see mah so I'm assuming now that I need
> to tell my local machine how to find the mah branch?
>
> Thanks
> John
>
> On 1/9/2012 8:38 AM, Michael Haberler wrote:
>> hm, I think its current
>>
>> try like so:
>>
>> mah@ubuntu-10:~/emc2-dev/src$ git checkout master
>> Switched to branch 'master'
>>
>> mah@ubuntu-10:~/emc2-dev/src$ git reset --hard origin/master
>> HEAD is now at cab62a3 Merge remote branch 'origin/v2.5_branch'
>>
>>
>> mah@ubuntu-10:~/emc2-dev/src$ git pull mah g84-dev
>>> From git://git.mah.priv.at/emc2-dev
>> * branch g84-dev -> FETCH_HEAD
>> Merge made by the 'recursive' strategy.
>> src/emc/rs274ngc/interp_array.cc | 4 +-
>> src/emc/rs274ngc/interp_check.cc | 6 +-
>> src/emc/rs274ngc/interp_cycles.cc | 135
>> +++++++++++++++++++++++++++++++++++
>> src/emc/rs274ngc/interp_internal.hh | 4 +-
>> src/emc/rs274ngc/rs274ngc_interp.hh | 4 +
>> 5 files changed, 147 insertions(+), 6 deletions(-)
>>
>> -m
>>
>> Am 09.01.2012 um 13:28 schrieb John Thornton:
>>
>>> Hi Michael,
>>>
>>> I guess by the time I pulled master this morning after the merge
>>> yesterday you were behind again with the patch... and I get the blasted
>>> error again.
>>>
>>> Thanks
>>> John
>>>
>>> On 1/9/2012 5:50 AM, Michael Haberler wrote:
>>>> sorry, I forgot to pull/rebase on master
>>>>
>>>> it should be fine now:
>>>>
>>>> http://git.mah.priv.at/gitweb/emc2-dev.git/shortlog/refs/heads/g84-dev
>>>>
>>>> - Michael
>>>>
>>>> Am 07.01.2012 um 13:23 schrieb John Thornton:
>>>>
>>>>> Michael,
>>>>>
>>>>> I've tried creating a test branch off of master and off of 2.5 then
>>>>> applying the patch but I get an error when I run git am.
>>>>>
>>>>> error: patch failed: src/emc/rs274ngc/interp_cycles.cc:347
>>>>>
>>>>> I think Rob also had a problem but he didn't spell it out but mentioned
>>>>> git so I suspect it might be the same.
>>>>>
>>>>> Thanks
>>>>> John
>>>>>
>>>>> On 1/6/2012 2:18 AM, Michael Haberler wrote:
>>>>>> I worked in cradek's irc remarks from yesterday
>>>>>>
>>>>>> I also made an attempt at the yz/xz planes 'by analogy' from
>>>>>> cycle_feed() - I am unsure wether this a) makes sense b) is correct
>>>>>>
>>>>>> http://git.mah.priv.at/gitweb/emc2-dev.git/shortlog/refs/heads/g84-dev
>>>>>>
>>>>>> I would appreciate a test/feedback by the interested folks
>>>>>>
>>>>>> interestingly, the g84.1 in plane g18 and g19 now stop at the bottom
>>>>>> like g81 which I dont understand, too
>>>>>>
>>>>>> -Michael
>>>>>> ------------------------------------------------------------------------------
>>>>>> Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
>>>>>> infrastructure or vast IT resources to deliver seamless, secure access to
>>>>>> virtual desktops. With this all-in-one solution, easily deploy virtual
>>>>>> desktops for less than the cost of PCs and save 60% on VDI infrastructure
>>>>>> costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
>>>>>> _______________________________________________
>>>>>> Emc-developers mailing list
>>>>>> Emc-developers@lists.sourceforge.net
>>>>>> https://lists.sourceforge.net/lists/listinfo/emc-developers
>>>>> ------------------------------------------------------------------------------
>>>>> Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
>>>>> infrastructure or vast IT resources to deliver seamless, secure access to
>>>>> virtual desktops. With this all-in-one solution, easily deploy virtual
>>>>> desktops for less than the cost of PCs and save 60% on VDI infrastructure
>>>>> costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
>>>>> _______________________________________________
>>>>> Emc-developers mailing list
>>>>> Emc-developers@lists.sourceforge.net
>>>>> https://lists.sourceforge.net/lists/listinfo/emc-developers
>>>> ------------------------------------------------------------------------------
>>>> Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
>>>> infrastructure or vast IT resources to deliver seamless, secure access to
>>>> virtual desktops. With this all-in-one solution, easily deploy virtual
>>>> desktops for less than the cost of PCs and save 60% on VDI infrastructure
>>>> costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
>>>> _______________________________________________
>>>> Emc-developers mailing list
>>>> Emc-developers@lists.sourceforge.net
>>>> https://lists.sourceforge.net/lists/listinfo/emc-developers
>>> ------------------------------------------------------------------------------
>>> Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
>>> infrastructure or vast IT resources to deliver seamless, secure access to
>>> virtual desktops. With this all-in-one solution, easily deploy virtual
>>> desktops for less than the cost of PCs and save 60% on VDI infrastructure
>>> costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
>>> _______________________________________________
>>> Emc-developers mailing list
>>> Emc-developers@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/emc-developers
>>
>> ------------------------------------------------------------------------------
>> Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
>> infrastructure or vast IT resources to deliver seamless, secure access to
>> virtual desktops. With this all-in-one solution, easily deploy virtual
>> desktops for less than the cost of PCs and save 60% on VDI infrastructure
>> costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
>> _______________________________________________
>> Emc-developers mailing list
>> Emc-developers@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/emc-developers
>
> ------------------------------------------------------------------------------
> Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
> infrastructure or vast IT resources to deliver seamless, secure access to
> virtual desktops. With this all-in-one solution, easily deploy virtual
> desktops for less than the cost of PCs and save 60% on VDI infrastructure
> costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
> _______________________________________________
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
