Hello,

I have a problem with the dif viewer (http://reviewboard/r/58/diff/)
complaining about the fact that patch complains about a malformed
patch at reviewboard/diffviewer/diffutils.py, line 125.

Checking by hand it turs out that the patchfile really is malformed:

review$ patch -l -o _tmp_test  /tmp/reviewboard.1PLuNw/tmpFCFZGk <  /
tmp/reviewboard.1PLuNw/produktpass.html.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: /branches/production/.../produktpass.html
|===================================================================
|--- /branches/production/2008-05-27/.../produktpass.html       (revision
4065)
|+++ /branches/production/2008-05-27/.../produktpass.html       (working
copy)
--------------------------
Patching file /tmp/reviewboard.1PLuNw/tmpFCFZGk using Plan A...
patch: **** malformed patch at line 291:

I have tried the patch utils coming with FreeBSD 7.0 (based on GNU
patch 2.1) and GNU patch 2.5.4. and both result in an "malformed
patch" error message. I see no obvious errors in the patchfile. Line
291 is the last (empty) line of the patchfile.

...
00000150  6b 74 70 61 73 73 2e 68  74 6d 6c 09 28 77 6f 72  |
ktpass.html.(wor|
00000160  6b 69 6e 67 20 63 6f 70  79 29 0a 40 40 20 2d 31  |king
copy).@@ -1|
00000170  2c 32 38 36 20 2b 30 2c  30 20 40 40 0a 2d 7b 25  |,286 +0,0
@@.-{%|
00000180  20 65 78 74 65 6e 64 73  20 22 69 6e 74 65 72 6e  | extends
"intern|
00000190  2f 62 61 73 65 5f 73 69  74 65 2e 68 74 6d 6c 22  |/
base_site.html"|
000001a0  20 25 7d 0a 2d 7b 25 20  6c 6f 61 64 20 69 31 38  | %}.-{%
load i18|
...
00002d60  0a 2d 3c 70 3e 0a 2d 20  20 20 20 7b 7b 20 70 72  |.-
<p>.-    {{ pr|
00002d70  6f 64 75 63 74 2e 61 6e  6e 6f 74 65 20 7d 7d 0a  |
oduct.annote }}.|
00002d80  2d 3c 2f 70 3e 0a 2d 0a  2d 3c 2f 64 69 76 3e 0a  |-</p>.-.-
</div>.|
00002d90  2d 0a 2d 7b 25 20 65 6e  64 62 6c 6f 63 6b 20 25  |-.-{%
endblock %|
00002da0  7d 0a                                             |}.|
00002da2

The review request was submitted by using post-review on MacOS 10.5
based on a Subversion repository.

Any suggestions where to start debugging? From which sources is /tmp/
reviewboard.1PLuNw/produktpass.html.diff actually generated?

--md
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"reviewboard" group.
To post to this group, send email to reviewboard@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to