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

svn_client_patch problem with "no newline at end of file"

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • trunk
    • ---
    • libsvn_diff
    • None

    Description

      The patch
      http://code.google.com/p/tortoisesvn/source/browse/trunk/test/mergediff/patch.diff
      should be applied to the folder
      http://code.google.com/p/tortoisesvn/source/browse/trunk/test/mergediff/#mergediff/FilesToPatch
      
      The problem shows when applying the patch to the file ShellCache.h:
      * ShellCache.h
       -> this file results in three applied and one rejected hunk
          the result as it *should* be is shown in image1, the result
          from svn_client_patch is shown in image2
      

      Attachments

        1. 1_Image_1.png
          8 kB
          Stefan Küng
        2. 2_Image_2.png
          11 kB
          Stefan Küng

        Activity

          People

            Unassigned Unassigned
            steveking Stefan Küng
            Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: