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

Allow merges with 'fuzz', like GNU patch does

    XMLWordPrintableJSON

Details

    • Improvement
    • Status: Open
    • Major
    • Resolution: Unresolved
    • trunk
    • unscheduled
    • libsvn_diff
    • None

    Description

      Via http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=138082
      Srilakshmanan, Lakshman has raised the following issue.
      
      Add one different line each(like 'line1', 'line2' etc) per commit to a file.
      
      Reverse merge the in between commit.
      Expected:
      It should reverse-merge successfully.
      
      Actual:
      Reverse-merge conflicts.
      
      Attached test.sh should demonstrate the issue.
      

      Original issue reported by kameshj

      Attachments

        1. 1_test.sh
          0.4 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: