1255: Traceback viewing diff for Mercurial 1.3 repository

yer***@gmai***** (Google Code) (Is this you? Claim this profile.)
Sept. 27, 2009
What version are you running?
1.0.1

What's the URL of the page containing the problem?
http://reviewboard-server/r/115/diff/#index_header

What steps will reproduce the problem?
1. Clone repository (mercurial 1.3 repo)
2. Make a minor change, run hg diff > hg.diff
3. In reviewboard Create New Request providing hg.diff
4. Click on "View Diff"

What is the expected output? What do you see instead?
I expect diff and see traceback instead.

What operating system are you using? What browser?
Windows Vista Ultimate SP2
Firefox 3.0.12

Please provide any additional information below.

Error text:
The patch to 'setup/SPB' didn't apply cleanly. The temporary files have
been left in '/tmp/reviewboard.3tarQx' for debugging purposes. `patch`
returned: patching file /tmp/reviewboard.3tarQx/tmp7t1HGD Hunk #1 FAILED at
3. Hunk #2 FAILED at 12. 2 out of 2 hunks FAILED -- saving rejects to file
/tmp/reviewboard.3tarQx/tmp7t1HGD-new.rej

Traceback (most recent call last):
  File
"/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.0.1-py2.6.egg/reviewboard/diffviewer/views.py",
line 152, in view_diff
    interdiffset, highlighting, True)
  File
"/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.0.1-py2.6.egg/reviewboard/diffviewer/diffutils.py",
line 623, in get_diff_files
    large_data=True)
  File
"/usr/local/lib/python2.6/dist-packages/Djblets-0.5.1-py2.6.egg/djblets/util/misc.py",
line 144, in cache_memoize
    data = lookup_callable()
  File
"/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.0.1-py2.6.egg/reviewboard/diffviewer/diffutils.py",
line 622, in <lambda>
    enable_syntax_highlighting),
  File
"/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.0.1-py2.6.egg/reviewboard/diffviewer/diffutils.py",
line 345, in get_chunks
    new = get_patched_file(old, filediff)
  File
"/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.0.1-py2.6.egg/reviewboard/diffviewer/diffutils.py",
line 261, in get_patched_file
    return patch(filediff.diff, buffer, filediff.dest_file)
  File
"/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.0.1-py2.6.egg/reviewboard/diffviewer/diffutils.py",
line 129, in patch
    (filename, tempdir, patch_output))
Exception: The patch to 'setup/SPB' didn't apply cleanly. The temporary
files have been left in '/tmp/reviewboard.3tarQx' for debugging purposes.
`patch` returned: patching file /tmp/reviewboard.3tarQx/tmp7t1HGD
Hunk #1 FAILED at 3.
Hunk #2 FAILED at 12.
2 out of 2 hunks FAILED -- saving rejects to file
/tmp/reviewboard.3tarQx/tmp7t1HGD-new.rej



-------------------------------------------------------------------
I've attached screenshot of ` cat /tmp/reviewboard.3tarQx/tmp7t1HGD-new >
content.html` with blurred info I can't show due to confidentiality agreement.

I believe the problem is in the fact this is catalog page instead of exact
file text page. 

We have other repositories which works fine. There is one visual difference
that I see -- other repos has "manifest" link and this one has "files"...
david
#1 david
You're going to have to look at the conflicts and see what actually failed to patch.
Usually this is due to line ending or character set conflicts.
  • +NeedInfo
#2 yer***@gmai***** (Google Code) (Is this you? Claim this profile.)
Issue was occasionally fixed by removing trailing "/" from the repository path........
david
#3 david
  • -NeedInfo
    +SetupIssue