Hello,

I submitted a patch but the patch failed (see http://drupal.org/node/1984962). I found the problem on the first lines.

diff --git a/feeds/feeds_ui/feeds_ui.admin.inc b/feeds/feeds_ui/feeds_ui.admin.inc
index fb63c8c..929f549 100755
--- a/feeds/feeds_ui/feeds_ui.admin.inc
+++ b/feeds/feeds_ui/feeds_ui.admin.inc

The bold text is not necessary and after removing this the patch passed.

I created a patch with tortoiseSVN and try another with git (git diff > filename.patch)
Both patches have the bold text.

What i'm doing wrong?

Comments

redsd’s picture

Hi,

You could try this: http://drupal.org/project/drupal/git-instructions

Ussually I load the project I want to edit, make the changes to the project in question and that use
git diff > [description]-[issue-number]-[comment-number].patch
to create the patch.

Are you using Git shell to create the patch?

[error: feeds/feeds_ui/feeds_ui.admin.inc: No such file or directory].
Maybe the patch info get screwed up somewhere along the line?

mvd81NL’s picture

Thanks Redsd, but thats exactly what i did.
I use cygwin (and another with TortoiseSVN) to create the patch

redsd’s picture

If you can place the file somewhere with the changes as download, I could try to create patch to see if it works using my git client.

mvd81NL’s picture

See the link in the first post :)

redsd’s picture

I meant the compleet file you changed, not just the patch :)

redsd’s picture

Okay I downloaded the module, using Git, I used the "broken" patch to apply the changes.

I created a new patch from that action and uploaded it in your issue.
The test seemed to work, but I'm still cluless why yours fails the test.

Anyway maybe you can compare the patches.

mvd81NL’s picture

Thanks, but the only difference are the paths. My second patch is the same as your patch. The second patch i created by edit the first patch (remove the bold text). So the patch is ok but i think i did something wrong to create the patch.

redsd’s picture

Ah overlooked that patch...

Still strange cause the patch still worked.