There was an error displaying this diff.

[tmc...@s2sys.com]

I'm just trying to post a diff to a review. But the error I get is


     There was an error displaying this diff.
     The patch to '<path> didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.VRycmo' for debugging purposes.
`patch` returned:

     This may be a bug in the software, a temporary outage, or an issue
     with the format of your diff.

     Please try again, and if you still have trouble,
     contact support.

   

Kinda disappointing

$ rbt post -r=1382 --submit-as=tmcleod --diff-only --diff-filename="review_diff.diff" --debug 95f4edc6..7c503a5a>>> RBTools 1.0.2
>>> Python 2.7.12 (default, Nov 12 2018, 14:36:49)
[GCC 5.4.0 20160609]
>>> Running on Linux-4.15.0-48-generic-x86_64-with-Ubuntu-16.04-xenial
>>> Home = /home/tmcleod
>>> Current directory = /home/tmcleod/src-git/Core-4.9/video/netvr/videostreamer
>>> Command line: rbt post -r=1382 --submit-as=tmcleod --diff-only --diff-filename=review_diff.diff --debug 95f4edc6..7c503a5a
>>> Running: tf vc help
>>> Checking for a Git repository...
>>> Running: git rev-parse --git-dir
>>> Running: git config core.bare
>>> Running: git rev-parse --show-toplevel
>>> Running: git symbolic-ref -q HEAD
>>> Running: git config --get branch.feature/5.1_vr1_videostreamer.merge
>>> Running: git config --get branch.feature/5.1_vr1_videostreamer.remote
>>> Running: git config --get remote.origin.url
>>> Repository info: Path: <git@...>, Base path: , Supports changesets: False
>>> Making HTTP GET request to https://reviews.s2sys.com/reviews/api/
>>> Making HTTP GET request to https://reviews.s2sys.com/reviews/api/validation/diffs/
>>> Cached response for HTTP GET https://reviews.s2sys.com/reviews/api/validation/diffs/ expired and was modified
>>> Making HTTP POST request to https://reviews.s2sys.com/reviews/api/validation/diffs/
>>> Making HTTP GET request to https://reviews.s2sys.com/reviews/api/review-requests/1382/?only-links=diffs%2Cdraft&only-fields=absolute_url%2Cbugs_closed%2Cid%2Cstatus%2Cpublic
>>> Cached response for HTTP GET https://reviews.s2sys.com/reviews/api/review-requests/1382/?only-links=diffs%2Cdraft&only-fields=absolute_url%2Cbugs_closed%2Cid%2Cstatus%2Cpublic expired and was not modified
>>> Making HTTP GET request to https://reviews.s2sys.com/reviews/api/review-requests/1382/diffs/?only-fields=
>>> Cached response for HTTP GET https://reviews.s2sys.com/reviews/api/review-requests/1382/diffs/?only-fields= expired and was modified
>>> Making HTTP POST request to https://reviews.s2sys.com/reviews/api/review-requests/1382/diffs/
>>> Making HTTP GET request to https://reviews.s2sys.com/reviews/api/review-requests/1382/draft/?only-fields=commit_id
>>> Cached response for HTTP GET https://reviews.s2sys.com/reviews/api/review-requests/1382/draft/?only-fields=commit_id expired and was not modified
Review request #1382 posted.

https://reviews.s2sys.com/reviews/r/1382/
https://reviews.s2sys.com/reviews/r/1382/diff/

[David Trowbridge]

What is "review_diff.diff" and how did you create it? Is there a reason why you're creating the diff beforehand instead of just letting rbtools make the diff between the specified revisions?

-David

--
Supercharge your Review Board with Power Pack: https://www.reviewboard.org/powerpack/
Want us to host Review Board for you? Check out RBCommons: https://rbcommons.com/
Happy user? Let us know! https://www.reviewboard.org/users/
---
You received this message because you are subscribed to the Google Groups "Review Board Community" group.
To unsubscribe from this group and stop receiving emails from it, send an email to reviewboard...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/reviewboard/a5700ca4-f872-4cba-bcd4-6502d1cc86c2%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[Thomas McLeod]

I created the diff. I can't get rbtools to create a diff between two revisions AND limit the review files. When I tell I give git hashes rbt post always creates a diff for the entire repository, though I want to review only a small part of it. Furthermore rbt post always creates diffs with significant white space. this occurs even though the debug output shows the correct git command with a file spec following "--".

Thomas McLeod

To view this discussion on the web visit https://groups.google.com/d/msgid/reviewboard/CAFS3VNU%2BQ25B%3DWokdeFQDw%3Do0yjiD_Ku3m0bQ9UiM%3DvZ4excoA%40mail.gmail.com.

For more options, visit https://groups.google.com/d/optout.

--

Thomas McLeod

Principal Software Engineer, Video Systems

s2sys.com  |  lenel.com  | 508.663.2500  (main) | 802.793.9798 (mobile)

Follow Us  LinkedIn  Twitter

[Thomas McLeod]

Ok, so apparently I have to give the full path of each file that I want to include in the diff, is that correct? How do I ignore whitespace in the diff?

T McLeod