2909: Unable to upload a diff produced by "cvs rdiff". Produces "Unable to parse diff revision header ..." error

burha*****@triomet******* (Google Code) (Is this you? Claim this profile.)
Sept. 20, 2013
What version are you running?
1.6.9

What's the URL of the page containing the problem?
/reviewboard/r/new/

What steps will reproduce the problem?
1. Generate a diff using "cvs rdiff -r <tag 1> -r <tag 2> <module>"

Here is an example file I generated to demonstrate the problem:

Index: cvstest/testfile
diff -u cvstest/testfile:1.22 cvstest/testfile:1.23
--- cvstest/testfile:1.22	Tue Feb 19 17:14:11 2013
+++ cvstest/testfile	Tue Feb 19 17:27:46 2013
@@ -9,7 +9,7 @@
 test
 test
 test
-another test
+test
 test
 test
 test

2. Create new review request.
3. Select the above file and click Upload.

What is the expected output? What do you see instead?

Expected result: File is uploaded and review process proceeds to the next step.

Actual result: An error message is shown:
Unable to parse diff revision header 'Tue Feb 19 17:14:11 2013'


What operating system are you using? What browser?
Fedora 16, Chrome.

Please provide any additional information below.

If I check out the second tag and do "cvs diff -r <tag 1>" then I get a diff that is usable by reviewboard, but it is of course cumbersome to have to do a checkout first.

Here is the same diff as earlier, generated in this way:

Index: testfile
===================================================================
RCS file: /vol/cvsroot/cvstest/testfile,v
retrieving revision 1.22
diff -u -r1.22 testfile
--- testfile	19 Feb 2013 17:14:11 -0000	1.22
+++ testfile	19 Feb 2013 17:27:18 -0000
@@ -9,7 +9,7 @@
 test
 test
 test
-another test
+test
 test
 test
 test
david
#1 david
Looks like what needs to happen here is that we need to support both these formats for the revision string:

file:<revision> <...>
file <...> <revision>

This should be a relatively straightforward change.
  • +Component-SCMTools
    +EasyFix
#2 Caffeina*********@gmai***** (Google Code) (Is this you? Claim this profile.)
This was fixed in revision a5e0a65d32f9b33c62ea2b1c822fa5df8ac63ce5.
david
#3 david
  • +Fixed