81: Unable to submit diffs generated between svn urls

mickt*****@gmai***** (Google Code) (Is this you? Claim this profile.)
June 4, 2007
What's the URL of the page containing the problem?


What steps will reproduce the problem?

1. Generate a diff using:
svn diff http://svn/repos/projects/myproj/trunk
http://svn/repos/projects/myproj/branches/mybranch-issue123 > review.diff

2. Use http://svn/repos/projects/myproj/trunk as the base diff path

3. Submit the diff and get the following:
SCMException at /r/new/
Unable to parse diff revision header '(.../trunk) (revision 13708)'
...
.../reviewboard-trunk/reviewboard/../reviewboard/scmtools/svn.py in
parse_diff_revision

  38. revision = revision_str.split()[1][:-1]
  39.
  40. if revision == "0":
  41. revision = PRE_CREATION
  42.
  43. return file_str, revision
  44. else:

  45. raise SCMException("Unable to parse diff revision header '%s'" % ...

  46. revision_str)
  47.
  48.
  49. def get_filenames_in_revision(self, revision):
  50. r = self.__normalize_revision(revision)
  51. logs = self.client.log(self.repopath, r, r, True)

Looking at the top of the diff:
Index: myfile.py
===================================================================
--- myfile.py       (.../trunk)     (revision 13708)
+++ myfile.py       (.../branches/mybranch-issue123) (revision 13708)
@@ -3,6 +3,7 @@
(edited to remove company specific source details)

What operating system are you using? What browser?

Running on debian linux, using camino browser on the mac.
chipx86
#1 chipx86
Fixed in SVN. When doing a diff like this, make sure your base path is "/"
  • +Fixed