Well, I removed the ">", and yes it goes a few steps further but it still
fail to apply
the error msg is :
fatal: sha1 information is lacking or useless (Domain.cs).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
so what can I do?
Regards
2010-11-02
Lancer
发件人: Matthias Bolte
发送时间: 2010-11-02 04:12:50
收件人: jclift
抄送: arnaud.champion; libvir-list; lancerhuang
主题: Re: [libvirt] SPAM-LOW: Re: Re: Node.GetInfo error
Ah, now I get what Arnaud meant in his other mail.
For some reason the first line in his patches has ">" in front of the
"From". Manually removing that ">" helps.
Matthias
2010/11/1 <jclift(a)redhat.com>:
I sometimes get a similar error with git patches from email, if I
use
Thunderbird to save them.
Thunderbird spreads the header information into several lines, so I need to
manually adjust that after saving, with a text editor.
Maybe that's the problem here too? :)
On 02/11/2010, at 3:00 AM, <arnaud.champion(a)devatom.fr> wrote:
:S I'm far away from a git expert :S
Maybe anyone on the list can help us ?
Arnaud
From: 黄亮
Sent: Monday, November 01, 2010 2:42 PM
To: arnaud.champion(a)devatom.fr
Subject: Re: Re: Re: SPAM-LOW: Re: Re: Node.GetInfo error
Hi Arnaud,
I tried GitExtension, but while applying patch, it returns
"Patch format detection failed. "
Should I change some settings or is there something not right in the patch
file?
Regards
2010-11-01
________________________________
Lancer
________________________________
发件人: arnaud.champion(a)devatom.fr
发送时间: 2010-11-01 16:55:51
收件人: 黄亮
抄送: libvir-list(a)redhat.com
主题: Re: Re: SPAM-LOW: Re: Re: Node.GetInfo error
Ok,
if you are under windows (like me), use GitExtension
(
http://sourceforge.net/projects/gitextensions/)
It works, not perfect, but it works.
Arnaud
From: 黄亮
Sent: Monday, November 01, 2010 9:52 AM
To: arnaud.champion(a)devatom.fr
Subject: Re: Re: SPAM-LOW: Re: Re: Node.GetInfo error
Hi Arnaud,
The NodeInfoStructure you sent to me yesterday works, thank you.
I saw your patch file, should I manually apply it to the source code or is
there some tools I can use to automatically apply the changes?
Regards
2010-11-01
________________________________
Lancer
________________________________
发件人: arnaud.champion(a)devatom.fr
发送时间: 2010-11-01 16:37:17
收件人: 黄亮
抄送: libvir-list
主题: Re: SPAM-LOW: Re: Re: Node.GetInfo error
Hi,
I think the solution is in the last patches I have send (which are not yet
in the git). Have you tried the NodeInfoStructure I have sended yesterday ?
Arnaud
From: 黄亮
Sent: Monday, November 01, 2010 3:01 AM
To: arnaud.champion(a)devatom.fr
Cc: libvir-list
Subject: SPAM-LOW: Re: Re: Node.GetInfo error
HI,
I tried
Errors.Error err = Errors.GetLastError();
MessageBox.Show(err.Message);
But IDE shows compilation errors that there is no "Error" defination in
"Errors", and "Errors.GetLastError()" returns int.
I made a guess that maybe it was like this:
Error err = Errors.SaveLastError();
MessageBox.Show("Get Info error: " + err.Message);
It can be compiled but "err.Message" has nothing in it.
Did I make a wrong assumption?
Regards
2010-11-01
________________________________
Lancer
________________________________
发件人: arnaud.champion(a)devatom.fr
发送时间: 2010-10-31 16:48:15
收件人: 黄亮
抄送: libvir-list(a)redhat.com
主题: Re: Node.GetInfo error
Ok,
at first GetLastError return an Error object. So you should anything like :
Errors.Error err = Errors.GetLastError();
MessageBox.Show(err.Message);
For the NodeInfo structure, I think the problem is the same that was for
DomainInfo, I'll check marshaling. Then respond you with the correct infos.
Arnaud
PS : can you also put libvirt-list(a)redhat.com in copy of your mails, to keep
everyone in the loop ?
From: 黄亮
Sent: Sunday, October 31, 2010 8:20 AM
To: arnaud.champion
Subject: Node.GetInfo error
Hi,
Sorry for disturbing again. But I get error while using Node.GetInfo.
Code:
NodeInfo aNodeInfo = new NodeInfo();
if (Node.GetInfo(con, aNodeInfo) < 0)
{
//MessageBox.Show("Node Info Error");
MessageBox.Show(Errors.GetLastError().ToString());
return 0f;
}
I'm sure con != IntPtr.Zero. I tried to use Errors.GetLastError(), it
returns int. But I don't know what to do with it.
So, any suggestions ? Thanks
Regards
2010-10-31
________________________________
Lancer
__________ Information from ESET Smart Security, version of virus signature
database 5577 (20101030) __________
The message was checked by ESET Smart Security.
http://www.eset.com
__________ Information from ESET Smart Security, version of virus signature
database 5580 (20101031) __________
The message was checked by ESET Smart Security.
http://www.eset.com
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
__________ Information from ESET Smart Security, version of virus signature
database 5583 (20101101) __________
The message was checked by ESET Smart Security.