Problems with patch file creation using svn diff and fold

lgp171188 · 08-27-2009, 03:20 AM

Hi,
I want to take the svn diff of a file and fold it to 80 columns width.

So I did this

Code:

$ svn diff > ~/patch.diff
$ fold -w 78 ~/patch.diff > ~/patch-fold.diff

But when I try to apply the patch, I get the error like

Code:

patching file trunk/site/py/adminservices/admin.py
patch: **** malformed patch at line 20: )

The lines 19,20 are:

- #res=password.passwd_change_date(user_id,tdate
)
-

This obviously appears that the diff format is disturbed. How to correct this?

forrestt · 08-28-2009, 11:49 AM

Why on earth do you expect a folded patch to work? It is no longer a patch, it is garbage. What are you trying to do? Perhaps we can give you a better solution.

Forrest