I think you want to leave the configure change out of this patch.
2010/6/1 Mariusz Pluciński vshader@gmail.com:
configure | 1 + configure.ac | 1 + include/gameux.idl | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 0 deletions(-)
Also, when you're sending a series where the later patches depend on the earlier patches, you should mark the correct order in your subject (i.e. start the subject with [1/5], [2/5], etc.).
On Tue, Jun 1, 2010 at 3:04 PM, Vincent Povirk madewokherd@gmail.com wrote:
I think you want to leave the configure change out of this patch.
2010/6/1 Mariusz Pluciński vshader@gmail.com:
configure | 1 + configure.ac | 1 + include/gameux.idl | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 0 deletions(-)
You're right, but I thought about numbering too late, when I noticed my patches appeared in wrong order.
I attached configure files, cause they're part of main tree. I though, that if they're intended to being generated, they would already be listed in .gitignore file. So, must I avoid sending both "configure" and "configure.ac" files?
Also, should I fix it, and resend these patches again now?
W dniu 01.06.2010 22:26, Vincent Povirk pisze:
Also, when you're sending a series where the later patches depend on the earlier patches, you should mark the correct order in your subject (i.e. start the subject with [1/5], [2/5], etc.).
On Tue, Jun 1, 2010 at 3:04 PM, Vincent Povirk madewokherd@gmail.com wrote:
I think you want to leave the configure change out of this patch.
2010/6/1 Mariusz Pluciński vshader@gmail.com:
configure | 1 + configure.ac | 1 + include/gameux.idl | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 0 deletions(-)
On 6/2/2010 20:07, Mariusz Pluciński wrote:
I attached configure files, cause they're part of main tree. I though, that if they're intended to being generated, they would already be listed in .gitignore file.
Not necessary, configure is tracked too and provided in sources tarballs.
So, must I avoid sending both "configure" and "configure.ac" files?
No. You changed .ac, and it should be included. Alexandre will regenerate configure with his autoconf. Just don't 'git add' files you don't need to send.
2010/6/2 Mariusz Pluciński vshader@gmail.com:
You're right, but I thought about numbering too late, when I noticed my patches appeared in wrong order.
I attached configure files, cause they're part of main tree. I though, that if they're intended to being generated, they would already be listed in .gitignore file. So, must I avoid sending both "configure" and "configure.ac" files?
configure.ac should be submitted but configure not since that one is generated. I'm not sure why configure isn't in .gitignore but AJ should be asked about that.
Roderick
I attached configure files, cause they're part of main tree. I though, that if they're intended to being generated, they would already be listed in .gitignore file. So, must I avoid sending both "configure" and "configure.ac" files?
The configure file is generated, and you should always avoid sending changes to that. That was not the reason I said you should not have them in the patch.
Your change to configure.ac appears to add gameux.dll, which you don't want to do just yet.
Also, should I fix it, and resend these patches again now?
You can do that, or you can wait and see what happens on http://source.winehq.org/patches/
The patch adding the header file looks good to me and does not depend on any other patches, so it may be accepted, or you may need to change it. Or Alexandre may just wait for you to resend the whole series correctly. I cannot guess.
W dniu 02.06.2010 18:21, Vincent Povirk pisze:
Your change to configure.ac appears to add gameux.dll, which you don't want to do just yet.
Right, I did not notice it. This should be part of next commit in my local tree. Valid using git is still little problematic for me.
The patch adding the header file looks good to me and does not depend on any other patches, so it may be accepted, or you may need to change it. Or Alexandre may just wait for you to resend the whole series correctly. I cannot guess.
OK, I'll fix and resend it. Thanks for your help.
-
Mariusz Pluciński -
Nikolay Sivov -
Roderick Colenbrander -
Vincent Povirk