Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

#20 Path for Subversion diffs with property changes

closed-fixed
nobody
None
5
2008-08-02
2008-07-29
No

When using CodeStriker with our local Subversion 1.5 repository, if I try to pull a revision that includes property changes (often the case now when revisions are issued from a Merge operation, since that will modify svn:mergeinfo), the diff breaks CodeStriker and a single file named "unknown.txt" is included in the topic.

I submitted request ID 2019715 about this, and I would like to provide the patch I did locally to fix it. I do not know if it's supposed to break something else so I will let you check it out; here, everything seems fine with this patch.

Discussion

  • David Sitsky
    David Sitsky
    2008-07-29

    Logged In: YES
    user_id=208928
    Originator: NO

    Your attachment is an html file with an error message, not the actual diff file. Can you try uploading it again?

    Also - I'd like to write a unit test to cover this. Can you also upload a small subversion diff which wasn't previously handled? Thanks.

     
  • Logged In: YES
    user_id=2032979
    Originator: YES

    Sorry, probably Opera that messed up the file upload. I'll try again when I have access to my work computer.

     
  • Logged In: YES
    user_id=2032979
    Originator: YES

    File Added: SubversionDiff.pm.diff

     
  • Patch for SubversionDiff.pm

     
  • Topic text for a topic that was causing a bug

     
  • Logged In: YES
    user_id=2032979
    Originator: YES

    File Added: SubversionDiff.pm.topic.1

     
  • Logged In: YES
    user_id=2032979
    Originator: YES

    File Added: SubversionDiff.pm.topic.2

     
  • Topic text for another topic that was causing a bug

     
  • Logged In: YES
    user_id=2032979
    Originator: YES

    I uploaded the patch again. While trying to generate a topic text that reproduced a problem, I found another one which I fixed also: if the diff contained a new file without content OR a file with only property changes, the generated topic also was malformed. You will find both fixes in the patch I uploaded. Hope this helps!

     
  • David Sitsky
    David Sitsky
    2008-08-02

    Logged In: YES
    user_id=208928
    Originator: NO

    Thanks for all that - I have added those two topic texts as unit tests. It turns out that the correct fix is somewhat more complicated, as your change actually breaks existing Subversion diffs that are presented in a slightly different format.

    Anyway - thanks for the report - the fixes are in CVS now.

     
  • David Sitsky
    David Sitsky
    2008-08-02

    • status: open --> closed-fixed
     
  • Logged In: YES
    user_id=2032979
    Originator: YES

    I was afraid that might be the case, since I am not a Subversion expert and only had our own server to test with. Glad you could find a way to fix this in a more generic way.