patch upload error message

91 views
Skip to first unread message

chuck j

unread,
Mar 29, 2013, 5:13:55 AM3/29/13
to revie...@googlegroups.com
Dear All,

This is frustrating developer reporting every second day with patch not getting upload in reviewboard.

can somebody help me resolve or tell me how to resolve such issue.

Diff currently unavailable.
Error: The patch to '//path/to/depot/file/bodypair_appregion.pcl' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.uUq6zC' for debugging purposes. `patch` returned: patching file /tmp/reviewboard.uUq6zC/tmpYlQESK Hunk #3 FAILED at 2153. 1 out of 3 hunks FAILED -- saving rejects to file /tmp/reviewboard.uUq6zC/tmpYlQESK-new.rej
Details
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/site-packages/ReviewBoard-1.7.5-py2.7.egg/reviewboard/diffviewer/views.py", line 383, in view_diff_fragment
    file = get_requested_diff_file()
  File "/usr/local/lib/python2.7/site-packages/ReviewBoard-1.7.5-py2.7.egg/reviewboard/diffviewer/views.py", line 309, in get_requested_diff_file

Regards,
Chuck

Christian Hammond

unread,
Mar 29, 2013, 4:43:09 PM3/29/13
to revie...@googlegroups.com, revie...@googlegroups.com
Hi,

How are the diffs being generated? What type of repository?

This is generally due to generating a diff incorrectly, so we should find out what's being done.

Christian
--
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...@googlegroups.com
For more options, visit this group at http://groups.google.com/group/reviewboard?hl=en
---
You received this message because you are subscribed to the Google Groups "reviewboard" group.
To unsubscribe from this group and stop receiving emails from it, send an email to reviewboard...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
 
 

chuck j

unread,
Apr 3, 2013, 2:52:34 AM4/3/13
to revie...@googlegroups.com

Dear All,


Do we have solution to avoid such issues.

-Chuck.

On Fri, Mar 29, 2013 at 2:43 PM, chuck j <cjerr...@gmail.com> wrote:
Dear All,

This is frustrating developer reporting every second day with patch not getting upload in reviewboard.

can somebody help me resolve or tell me how to resolve such issue.

Diff currently unavailable.
Error: The patch to '//path/to/depot/file/bodypair_appregion.pcl' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.uUq6zC' for debugging purposes. `patch` returned: patching file /tmp/reviewboard.uUq6zC/tmpYlQESK Hunk #3 FAILED at 2153. 1 out of 3 hunks FAILED -- saving rejects to file /tmp/reviewboard.uUq6zC/tmpYlQESK-new.rej

Traceback (most recent call last):
  File "/usr/local/lib/python2.7/site-packages/ReviewBoard-1.7.5-py2.7.egg/reviewboard/diffviewer/views.py", line 383, in view_diff_fragment
    file = get_requested_diff_file()
  File "/usr/local/lib/python2.7/site-packages/ReviewBoard-1.7.5-py2.7.egg/reviewboard/diffviewer/views.py", line 309, in get_requested_diff_file

Regards,
Chuck

David Trowbridge

unread,
Apr 3, 2013, 3:10:57 AM4/3/13
to reviewboard
Dear Chuck,

Christian asked you a number of questions to try to help narrow down what might be going wrong. We can't have a solution until you answer them.

Specifically:
How are the diffs being generated? What type of repository?
>
> This is generally due to generating a diff incorrectly, so we should find out what's being done.


-David

chuck j

unread,
Apr 3, 2013, 7:00:20 AM4/3/13
to revie...@googlegroups.com
Diff get generated using rbtools, repository used is perforce. I guess rbtools using diff util to generate diff.

Also there is another issue also. When single line change RB web console view diff shows complete file as change.

chuck j

unread,
Apr 3, 2013, 2:50:28 PM4/3/13
to revie...@googlegroups.com
Hi Chris,

Its seems my response are getting overlapped, sorry for inconvenience.


Diff get generated using rbtools, repository used is perforce. I guess rbtools using diff util to generate diff.

Also there is another issue also. When single line change RB web console view diff shows complete file as change.

Please let me know if you need any other information.

-Chuck

You received this message because you are subscribed to a topic in the Google Groups "reviewboard" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/reviewboard/l4DVzR4_H6U/unsubscribe?hl=en.
To unsubscribe from this group and all its topics, send an email to reviewboard...@googlegroups.com.

Christian Hammond

unread,
Apr 3, 2013, 5:06:27 PM4/3/13
to revie...@googlegroups.com
Can you provide the entire debug log when using post-review to upload a broken change?

What version of RBTools?

Christian

--
Christian Hammond - chi...@chipx86.com
Review Board - http://www.reviewboard.org
Beanbag, Inc. - http://www.beanbaginc.com

chuck j

unread,
Apr 4, 2013, 2:24:07 AM4/4/13
to revie...@googlegroups.com
Thanks Chris,

RBTools version is 4.3., sometime we have also see view diff show extra lines in diff, but the diff shows through p4 does not shows that diff.

DEBUG:root:Checking for a Perforce repository...
DEBUG:root:Running: p4 info

DEBUG:root:Running: diff --version

DEBUG:root:repository info: Path: my_perforce_server.com:1666, Base path: None, Supports changesets: True

INFO:root:Generating diff for changenum 188276
DEBUG:root:Running: p4 describe -s 188276

DEBUG:root:Processing edit of //depot/path/codeline/source/pcl/custom/dbxs_link64.cmd
DEBUG:root:Writing "//depot/path/codeline/source/pcl/custom/dbxs_link64.cmd#5" to "c:\users\apat\appdata\local\temp\tmpl9ws7h"
DEBUG:root:Running: p4 print -o c:\users\apat\appdata\local\temp\tmpl9ws7h -q //depot/path/codeline/source/pcl/custom/dbxs_link64.cmd#5

DEBUG:root:Running: diff -urNp c:\users\apat\appdata\local\temp\tmpl9ws7h e:\\pat_full\\depoty\\path\\codeline\\source\\pcl\\custom\\dbxs_link64.cmd

DEBUG:root:Command exited with rc 1: ['diff', '-urNp', 'c:\\users\\apat\\appdata\\local\\temp\\tmpl9ws7h', 'e:\\pat_full\\depoty\\path\\codeline\\source\\pcl\\custom\\dbxs_link64.cmd']
--- c:\\users\\apat\\appdata\\local\\temp\\tmpl9ws7h 2013-04-04 11:21:52.798153800 +0530

+++ e:\\pat_full\\depoty\\path\\codeline\\source\\pcl\\custom\\dbxs_link64.cmd 2013-04-04 11:01:29.868974300 +0530

@@ -19,7 +19,7 @@ rem # All rights reserved

rem #

rem #------------------------------------------------------------------

rem

-

+rem test


rem # Fetch value of $D3_HOME or set to default value of "c:\comp\paat2006

rem # if this environment variable is not set

---



post-review.exe -o --bugs-closed="job-id" --branch="codeline" --server=http://rb.company.com/rb --submit-as=apat --description-file="c:\users\apat\appdata\local\temp\tmppzcc08" 188276 --p4-port="my_perforce_server.com:1666"


posting review request...
>>> RBTools 0.4.3

>>> Python 2.5.4 (r254:67916, Dec 23 2008, 15:10:54) [COMP v.1310 32 bit (Intel)]

>>> Running on Windows-Vista-6.1.7601

>>> Home = c:\users\apat\AppData\Roaming

>>> Current Directory = e:\pat_full

>>> Checking the repository type. Errors shown below are mostly harmless.

>>> Finished checking the repository type.

>>> HTTP GETting api/info/

>>> HTTP GETting api/

>>> HTTP GETting http://rb.company.com/rb/api/info/

>>> Using the new web API

>>> Attempting to create review request on my_perforce_server.com:1666 for 188276

>>> Submitting the review request as apat

>>> HTTP POSTing to http://rb.company.com/rb/api/review-requests/: {'changenum': '188276', 'submit_as': 'apat', 'repository': 'my_perforce_server.com:1666'}

>>> Got API Error 204 (HTTP code 409): The change number specified has already been used

>>> Error data: {u'stat': u'fail', u'review_request': {u'status': u'discarded', u'last_updated': u'2013-04-04T05:37:16Z', u'description': u'temp\n', u'links': {u'diffs': {u'href': u'http://rb.company.com/rb/api/review-requests/45465/diffs/', u'method': u'GET'}, u'repository': {u'href': u'http://rb.company.com/rb/api/repositories/1/', u'method': u'GET', u'title': u'pf-sa-1666'}, u'changes': {u'href': u'http://rb.company.com/rb/api/review-requests/45465/changes/', u'method': u'GET'}, u'self': {u'href': u'http://rb.company.com/rb/api/review-requests/45465/', u'method': u'GET'}, u'update': {u'href': u'http://rb.company.com/rb/api/review-requests/45465/', u'method': u'PUT'}, u'last_update': {u'href': u'http://rb.company.com/rb/api/review-requests/45465/last-update/', u'method': u'GET'}, u'reviews': {u'href': u'http://rb.company.com/rb/api/review-requests/45465/reviews/', u'method': u'GET'}, u'draft': {u'href': u'http://rb.company.com/rb/api/review-requests/45465/draft/', u'method': u'GET'}, u'file_attachments': {u'href': u'http://rb.company.com/rb/api/review-requests/45465/file-attachments/', u'method': u'GET'}, u'submitter': {u'href': u'http://rb.company.com/rb/api/users/apat/', u'method': u'GET', u'title': u'apat'}, u'screenshots': {u'href': u'http://rb.company.com/rb/api/review-requests/45465/screenshots/', u'method': u'GET'}, u'delete': {u'href': u'http://rb.company.com/rb/api/review-requests/45465/', u'method': u'DELETE'}}, u'target_groups': [], u'bugs_closed': [], u'changenum': 188276, u'target_people': [], u'testing_done': u'', u'branch': u'', u'id': 45465, u'time_added': u'2013-04-04T05:33:38Z', u'summary': u'temp', u'public': False}, u'err': {u'msg': u'The change number specified has already been used', u'code': 204}}

>>> Review request already exists. Updating it...

>>> HTTP PUTting to http://rb.company.com/rb/api/review-requests/45465/: {'changenum': 188276}

>>> Attempting to set field 'branch' to 'codeline' for review request '45465'

>>> HTTP PUTting to http://rb.company.com/rb/api/review-requests/45465/draft/: {'branch': 'codeline'}

>>> Attempting to set field 'bugs_closed' to 'job-id' for review request '45465'

>>> HTTP PUTting to http://rb.company.com/rb/api/review-requests/4
5465/draft/: {'bugs_closed': 'job-id'}

>>> Attempting to set field 'description' to 'temp


>>> Uploading diff, size: 471

>>> HTTP POSTing to http://rb.company.com/rb/api/review-requests/45465/diffs/: {}

Review request #45465 posted.



http://rb.company.com/rb/r/45465/

Reply all
Reply to author
Forward
0 new messages