Okay, now that is pretty important. I know you normalized the debug output
to prevent any leaked info, but are you sure the file paths were all "/" and
not a mix of "/" and "\" ?

Can you run with --output-diff and then see if that applies to a new
checkout, or if not, what the reject files contain?

Christian

-- 
Christian Hammond - [EMAIL PROTECTED]
VMware, Inc.


On Fri, Oct 17, 2008 at 7:45 AM, Jeff Mickey <[EMAIL PROTECTED]> wrote:

>
> Here's what happens when I do a post-review -d 837119:
>
> >>> Repository info 'Path: fake-server:1666, Base path: None, Supports
> changesets: True'
> >>> Generating diff for changenum 837119
> >>> p4 describe -s 837119
> >>> Pending diff
> >>> p4 client -o
> >>> Client from client spec: jmickey:smokejumper
> >>> Client from change description: jmickey:smokejumper
> >>> Processing edit of //some/awesome/file_sysctl.c
> >>> Writing "//some/awesome/file_sysctl.c#13" to "/tmp/tmpB_wTIQ"
> >>> p4 print -q //some/awesome/file_sysctl.c#13
> >>> p4 where //some/awesome/file_sysctl.c
> >>> diff_cmd = ['diff', '-urNp', '/tmp/tmpB_wTIQ',
> '/home/me/path/to/some/file_sysctl.c\n']
> >>> diff -urNp /tmp/tmpB_wTIQ /home/me/path/to/some/file_sysctl.c
>
> [... repeats for other files ...]
>
> >>> Looking for 'reviewboard.server.com /' cookie in
> /home/me.post-review-cookies.txt
> >>> Loaded valid cookie -- no login required
> >>> Attempting to create review request for 837119
> >>> HTTP POSTing to
> http://reviewboard.server.com/api/json/reviewrequests/new/:
> {'repository_path': 'fake-server:1666', 'changenum': '837119'}
> >>> Review request already exists. Updating it...
> >>> HTTP POSTing to
> http://reviewboard.server.com/api/json/reviewrequests/10/update_from_changenum/:
> {}
> >>> Review request created
> >>> Uploading diff, size: 37020
> >>> HTTP POSTing to
> http://reviewboard.server.com/api/json/reviewrequests/10/diff/new/: {}
> Review request #10 posted.
>
> http://reviewboard.server.com/r/10
>
> I go to that link and I get:
>
> The patch to '//some/awesome/file_sysctl.h' didn't apply cleanly. The
> temporary files have been left in '/tmp/reviewboard.r8lZqM' for
> debugging purposes. `patch` returned: patching file /tmp/
> reviewboard.r8lZqM/tmpk3CBf_ Hunk #1 FAILED at 10. 1 out of 1 hunk
> FAILED -- saving rejects to file /tmp/reviewboard.r8lZqM/tmpk3CBf_-
> new.rej
>
> Traceback (most recent call last):
>  File "/srv/reviewboard/diffviewer/views.py", line 86, in view_diff
>    files = get_diff_files(diffset, None, interdiffset, highlighting)
>  File "/root/reviewboard/diffviewer/diffutils.py", line 651, in
> get_diff_files
>  File "/root/reviewboard/diffviewer/diffutils.py", line 567, in
> generate_files
>  File "/root/reviewboard/djblets/util/misc.py", line 55, in
> cache_memoize
>  File "/root/reviewboard/diffviewer/diffutils.py", line 570, in
> <lambda>
>  File "/root/reviewboard/diffviewer/diffutils.py", line 338, in
> get_chunks
>  File "/root/reviewboard/diffviewer/diffutils.py", line 254, in
> get_patched_file
>  File "/root/reviewboard/diffviewer/diffutils.py", line 122, in patch
> Exception: The patch to '//some/awesome/file_sysctl.h' didn't apply
> cleanly. The temporary files have been left in '/tmp/
> reviewboard.r8lZqM' for debugging purposes.
> `patch` returned: patching file /tmp/reviewboard.r8lZqM/tmpk3CBf_
> Hunk #1 FAILED at 10.
> 1 out of 1 hunk FAILED -- saving rejects to file /tmp/
> reviewboard.r8lZqM/tmpk3CBf_-new.rej
>
> And the relevant part of the log relating to that is:
>
> 2008-10-16 11:45:19,751 - INFO - Logging to /srv/reviewboard/
> logsnstuff/reviewboard.log with a minimum level of DEBUG
> 2008-10-16 11:45:19,752 - INFO - Log file for Review Board v0.9
> 2008-10-16 11:45:20,273 - DEBUG - DiffParser.parse: Beginning parse of
> diff, size = 37020
> 2008-10-16 11:45:20,286 - DEBUG - DiffParser.parse: Finished parsing
> diff.
> 2008-10-16 11:46:04,917 - INFO - Logging to /srv/reviewboard/
> logsnstuff/reviewboard.log with a minimum level of DEBUG
> 2008-10-16 11:46:04,917 - INFO - Log file for Review Board v0.9
> 2008-10-16 11:46:05,004 - DEBUG - Generating diff viewer page for
> filediff id 4
> 2008-10-16 11:46:05,004 - DEBUG - Begin: Generating diff file info for
> diffset id 4
> 2008-10-16 11:46:05,009 - DEBUG - Begin: Patching file //some/awesome/
> file_sysctl.h
> 2008-10-16 11:46:05,026 - DEBUG - End: Patching file //some/awesome/
> file_sysctl.h
> 2008-10-16 11:46:05,027 - DEBUG - Patching file //some/awesome/
> file_sysctl.h took 0.17047 seconds
>
> And yes, it stops there, even though there are other files.  I suspect
> that is because of the first diff breaking.  I'm just not sure what to
> change on this server to get it working .  Thanks for your help!
>
>  //  jeff
> >
>

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"reviewboard" group.
To post to this group, send email to reviewboard@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to