[Solved] Patch Error on commit fd6704bc4329

Issue #8 resolved

Nobody created an issue 2012-10-05

I'm running into ...

Fatal Git Apply: bad git diff expected dev/null/ on line 106...

Looks like line 106 reads

--- /dev/null

Little strange... :(

Comments (7)

Nobody reporter
- assigned issue to
  
  trickerer
- edited description
- 2012-10-05T19:52:33+00:00
trickerer repo owner
sorry for delay ehm... is it really a Trinity commit? I can't find it... but it is not a problem. Are you trying to apply this patch after some another? I am a little busy solving #5218 Try to patch it (you will most likely get some rejects):

patch -p1 < AllBots.patch
- 2012-10-07T07:12:32+00:00
trickerer repo owner
- changed status to open
- 2012-10-07T15:12:25+00:00
Nobody reporter
Sorry I linked my local commit from my repo, not trinity. Still the same though. commit 0620d2249131d681529f8a69f8bbec5e1773ad4d (Trinity) 10.08.12 - Clean Fresh pull, no other patches.

I didn't use patch -p1 < Allbots.patch Haven't used patch -p1 in years.

Using Git apply patch --reject allbots.patch
- 2012-10-09T00:47:13+00:00
trickerer repo owner
Tinity GIT Commands Topic

Apply patch to sources:
git apply < <patch_name>.patch

Apply patch to sources with creating of new files:
patch -p1 < <patch_name>.patch

So basically using patch command is a way to apply this patch properly
- 2012-10-09T04:52:38+00:00
Nobody reporter
- changed status to resolved
- 2012-10-22T04:46:07+00:00
Nobody reporter
Thanks. Always used git --reject to get the .rej files. Never tried -p1. Worked just fine.
- 2012-10-22T04:46:51+00:00
Log in to comment