Are you running a release or a nightly of RBTools? The nightlies support Git
a lot better, and are worth trying before debugging this further.

You can also run --output-diff to see what the diff looks like.

Christian

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


On Mon, Jan 18, 2010 at 10:08 PM, Viktor <kelemen.vik...@gmail.com> wrote:

> Hello,
>
> We use the 1.0.5.1 version of Review-board and post-review 0.8 with
> Git
>
> after commit in a feature branch i say:
> post-review -d --parent master
>
> The post-review script runs successfully and i get the url
> like http://<server>/r/632
>
> but when i go to this url and want to see the diff, i get an error
> message:
>
> The patch to '<filepath>' didn't apply cleanly. The temporary files
> have been left in '/tmp/reviewboard.sZmXAA' for debugging purposes.
> `patch` returned: patching file /tmp/reviewboard.sZmXAA/tmptzO3F2
> Reversed (or previously applied) patch detected! Assume -R? [n] Apply
> anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects
> to file /tmp/reviewboard.sZmXAA/tmptzO3F2-new.rej
>
> Traceback (most recent call last):
>  File "/usr/lib/python2.4/site-packages/ReviewBoard-1.0.5.1-py2.4.egg/
> reviewboard/diffviewer/views.py", line 153, in view_diff
>    interdiffset, highlighting, True)
>  File "/usr/lib/python2.4/site-packages/ReviewBoard-1.0.5.1-py2.4.egg/
> reviewboard/diffviewer/diffutils.py", line 623, in get_diff_files
>    large_data=True)
>  File "/usr/lib/python2.4/site-packages/Djblets-0.5.6-py2.4.egg/
> djblets/util/misc.py", line 162, in cache_memoize
>    data = lookup_callable()
>  File "/usr/lib/python2.4/site-packages/ReviewBoard-1.0.5.1-py2.4.egg/
> reviewboard/diffviewer/diffutils.py", line 622, in <lambda>
>    enable_syntax_highlighting),
>  File "/usr/lib/python2.4/site-packages/ReviewBoard-1.0.5.1-py2.4.egg/
> reviewboard/diffviewer/diffutils.py", line 345, in get_chunks
>    new = get_patched_file(old, filediff)
>  File "/usr/lib/python2.4/site-packages/ReviewBoard-1.0.5.1-py2.4.egg/
> reviewboard/diffviewer/diffutils.py", line 261, in get_patched_file
>    return patch(filediff.diff, buffer, filediff.dest_file)
>  File "/usr/lib/python2.4/site-packages/ReviewBoard-1.0.5.1-py2.4.egg/
> reviewboard/diffviewer/diffutils.py", line 126, in patch
>    raise Exception(_("The patch to '%s' didn't apply cleanly. The
> temporary " +
> Exception: The patch to 'adm/app/controllers/campaign_api.rb' didn't
> apply cleanly. The temporary files have been left in '/tmp/
> reviewboard.sZmXAA' for debugging purposes.
> `patch` returned: patching file /tmp/reviewboard.sZmXAA/tmptzO3F2
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file /tmp/
> reviewboard.sZmXAA/tmptzO3F2-new.rej
>
>
>
> It seems something wrong with the diff that the post-review generates,
> but no idea what...
>
> thx and best,
>  Viktor
>
> --
> 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<reviewboard%2bunsubscr...@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