[Building Sakai] Problem with patch
Raad Al-Rawi
raad at caret.cam.ac.uk
Thu Jun 9 07:34:53 PDT 2011
Hi Daniel
svn diff is only really designed to work with non-binary files.
It is possible, however, to force some binary processing by switching
svn to use the standard diff command:
svn diff --force --diff-cmd /usr/bin/diff -x -auN -r84409:84410
https://source.sakaiproject.org/svn/reference/branches/sakai-2.7.x/ >
parche_SAK-19179.patch
then use the following to reconstruct:
patch --force --strip=0 --input=parche_SAK-19179.patch
haven't tested this exhaustively, so can't guarantee the results!
Cheers
Raad
On 09-Jun-11 13:18, Daniel Merino wrote:
> Hi everyone.
>
> Has anybody ever found this weird problem?
>
> svn diff -r84409:84410
> https://source.sakaiproject.org/svn/reference/branches/sakai-2.7.x/>
> parche_SAK-19179.patch
>
> patch -p0 --dry-run< parche_SAK-19179.patch
> patch: **** Only garbage was found in the patch input.
>
> The patch should add several binary images to reference. It seems that
> it was merged to trunk with no problem.
>
> I have found nothing useful about this error in the web. Could it be a
> character coding issue (i.e. a Windows patch inside a Linux server)?
>
> Thanks in advance.
> Best regards.
More information about the sakai-dev
mailing list