Hi Florian,

After the review, I assume you made some changes that were either left in
the index or committed to another commit, right? You must make sure that
the diff is going to cover changes made since an upstream revision (such as
origin/master..HEAD), rather than just what's in the index or in the latest
commit or whatever.

That's usually the cause of the error you're using.

I recommend using the post-review tool, as it automates that for you.

Christian

-- 
Christian Hammond - chip...@chipx86.com
Review Board - http://www.reviewboard.org
VMware, Inc. - http://www.vmware.com


On Mon, May 21, 2012 at 12:35 PM, Florian Leibert <f...@leibert.de> wrote:

> Hi,
> I created a diff (the current revision and some previous version),
> uploaded the diff while creating a new review request. Then, I
> committed my revision locally. Later after a review, i went ahead and
> updated the diff via the web ui, i.e. locally i did a git diff --full-
> index > foo.diff.
> Uploading the diff succeeds but I get the cryptic error below - what
> went wrong?
>
> Thanks,
> Florian
>
>
> The patch to 'installer' didn't apply cleanly. The temporary files
> have been left in '/tmp/reviewboard.S_QiA8' for debugging purposes.
> `patch` returned: patching file /tmp/reviewboard.S_QiA8/tmp0ffY9y Hunk
> #1 FAILED at 101. 1 out of 1 hunk FAILED -- saving rejects to file /
> tmp/reviewboard.S_QiA8/tmp0ffY9y-new.rej
>
> Traceback (most recent call last):
>  File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.5-
> py2.7.egg/reviewboard/diffviewer/views.py", line 151, in view_diff
>    interdiffset, highlighting, True)
>  File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.5-
> py2.7.egg/reviewboard/diffviewer/diffutils.py", line 1072, in
> get_diff_files
>    large_data=True)
>  File "/usr/local/lib/python2.7/dist-packages/Djblets-0.6.16-
> py2.7.egg/djblets/util/misc.py", line 157, in cache_memoize
>    data = lookup_callable()
>  File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.5-
> py2.7.egg/reviewboard/diffviewer/diffutils.py", line 1071, in <lambda>
>    enable_syntax_highlighting)),
>  File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.5-
> py2.7.egg/reviewboard/diffviewer/diffutils.py", line 553, in
> get_chunks
>    new = get_patched_file(old, filediff)
>  File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.5-
> py2.7.egg/reviewboard/diffviewer/diffutils.py", line 375, in
> get_patched_file
>    return patch(filediff.diff, buffer, filediff.dest_file)
>  File "/usr/local/lib/python2.7/dist-packages/ReviewBoard-1.6.5-
> py2.7.egg/reviewboard/diffviewer/diffutils.py", line 243, in patch
>    (filename, tempdir, patch_output))
> Exception: The patch to 'installer' didn't apply cleanly. The
> temporary files have been left in '/tmp/reviewboard.S_QiA8' for
> debugging purposes.
> `patch` returned: patching file /tmp/reviewboard.S_QiA8/tmp0ffY9y
> Hunk #1 FAILED at 101.
> 1 out of 1 hunk FAILED -- saving rejects to file /tmp/
> reviewboard.S_QiA8/tmp0ffY9y-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

-- 
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