Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-2164

'svn diff' creates patch that cannot be applied back, due to expanded keyword in repository

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • 1.1.x
    • 1.7.0
    • libsvn_diff
    • None
    • Windows 2000

    Description

      Hi,
      
      it is odd that when I used svn diff, it created patch file, that could not be 
      completely applied. All I did was:
      
      1. svn checkout
      2. modify file
      3. svn diff file > patch.diff
      4. svn revert file
      5. patch -u -i patch.diff file
      
      Result:
      patching file `file'
      Hunk #2 FAILED at 25.
      1 out of 3 hunks FAILED -- saving rejects to file.rej
      
      The problem can be replicated on file CopletStatus.java. 
      I run diff three different ways:
      a. svn diff CopletStatusEvent.java
      b. svn diff --diff-cmd diff CopletStatusEvent.java 
      c. diff -u orig/CopletStatusEvent.java modified/CopletStatusEvent.java
      
      All three resulted in different patch and only c.) unix diff patch file worked 
      on applying back to origin with no failures.
      
      I enclosed svndiff-bugreport.zip. Please read readme.txt as it contains full 
      guide how to replicate the problem and it contains also my results (outputs).
      
      Thank you,
      Michal
      

      Original issue reported by durdina

      Attachments

        1. 1_svndiff-bugreport.zip
          81 kB
          Subversion Importer

        Activity

          People

            Unassigned Unassigned
            subversion-importer Subversion Importer
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: