I've upgraded from 1.0.8 to 1.5b2 and this is still happening.  This
is on a server running Ubuntu 10.04; I'm wondering if it has to do
with something on the server and if anybody else is seeing (or not
seeing) similar issues on Ubuntu 10.04.  Again, I've examined the .rej
file and the .diff file dumped into /tmp and this does not appear to
be a case of line-ending issues.

I'm kind of at a loss at this point for how to continue to
troubleshoot this issue. 'patch' is failing on an incredibly simple
patch:

/tmp/reviewboard.9HV3Hs# cat install.py.diff
diff -r a5dc3a9027ca -r b039ee5a3c25 install.py
--- a/install.py        Wed Jun 09 10:19:15 2010 -0700
+++ b/install.py        Wed Jun 09 10:39:57 2010 -0700
@@ -1,3 +1,5 @@
+# install.py
+
 order = 99
 install_data = (
     ('install/workgroup', None),


Here's the reject file:

/tmp/reviewboard.9HV3Hs# cat tmpYvMLPF-new.rej
--- install.py  Wed Jun 09 10:19:15 2010 -0700
+++ install.py  Wed Jun 09 10:39:57 2010 -0700
@@ -1,3 +1,5 @@
+# install.py
+
 order = 99
 install_data = (
     ('install/workgroup', None),

And the error message and traceback:

Traceback (most recent call last):
  File "/usr/local/lib/python2.6/dist-packages/reviewboard/diffviewer/
views.py", line 153, in view_diff
    interdiffset, highlighting, True)
  File "/usr/local/lib/python2.6/dist-packages/reviewboard/diffviewer/
diffutils.py", line 881, in get_diff_files
    large_data=True)
  File "/usr/local/lib/python2.6/dist-packages/djblets/util/misc.py",
line 166, in cache_memoize
    data = lookup_callable()
  File "/usr/local/lib/python2.6/dist-packages/reviewboard/diffviewer/
diffutils.py", line 880, in <lambda>
    enable_syntax_highlighting)),
  File "/usr/local/lib/python2.6/dist-packages/reviewboard/diffviewer/
diffutils.py", line 531, in get_chunks
    new = get_patched_file(old, filediff)
  File "/usr/local/lib/python2.6/dist-packages/reviewboard/diffviewer/
diffutils.py", line 356, in get_patched_file
    return patch(filediff.diff, buffer, filediff.dest_file)
  File "/usr/local/lib/python2.6/dist-packages/reviewboard/diffviewer/
diffutils.py", line 224, in patch
    (filename, tempdir, patch_output))
Exception: The patch to 'install.py' didn't apply cleanly. The
temporary files have been left in '/tmp/reviewboard.9HV3Hs' for
debugging purposes.
`patch` returned: patching file /tmp/reviewboard.9HV3Hs/tmpYvMLPF
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file /tmp/reviewboard.
9HV3Hs/tmpYvMLPF-new.rej

-- 
Want to help the Review Board project? Donate today at 
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~----------~----~----~----~------~----~------~--~---
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en

Reply via email to