Hi Roger,
This one imported just fine.
I am running tests, and if they pass (which I'm sure they will), then
your changes will be pushed upstream automatically - and the
documentation updated.
On 03/27/2013 04:44 PM, Roger wrote:
> Hi Alan,
>
> Try this export.
> I re cloned and merged the changes.
>
> Roger
>
> On 03/27/2013 03:17 PM, Alan Robertson wrote:
>> I don't quite know what happened - but it didn't import...
>>
>> $ hg import ../Roger\ 27\ March-\ export-tip.txt
>> applying ../Roger 27 March- export-tip.txt
>> patching file include/misc.h
>> Hunk #2 FAILED at 42
>> 1 out of 2 hunks FAILED -- saving rejects to file include/misc.h.rej
>> patching file nanoprobe/nanoprobe.c
>> Hunk #1 FAILED at 28
>> Hunk #2 FAILED at 56
>> Hunk #3 FAILED at 64
>> Hunk #4 FAILED at 226
>> Hunk #5 FAILED at 244
>> Hunk #6 FAILED at 275
>> Hunk #7 FAILED at 341
>> Hunk #8 FAILED at 384
>> 8 out of 9 hunks FAILED -- saving rejects to file
>> nanoprobe/nanoprobe.c.rej
>> abort: patch failed to apply
>> servidor:~/monitor/src $
>>
>
--
Alan Robertson <[email protected]> - @OSSAlanR
"Openness is the foundation and preservative of friendship... Let me claim
from you at all times your undisguised opinions." - William Wilberforce
_______________________________________________
Assimilation mailing list - Discovery-Driven Monitoring
[email protected]
http://lists.community.tummy.com/cgi-bin/mailman/listinfo/assimilation
http://assimmon.org/
