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

diff3 implementation should deal better with files (or props) that don't end in newlines

    XMLWordPrintableJSON

    Details

      Description

      Hmm, so I got a prop conflict on 1.4.x and selected (e)dit and got this:

      <<<<<<< (modified)
      /trunk:1-19523,[...],27263=======
      /trunk:1-19523,[...],26156>>>>>>> (latest)

      Shouldn't there be newlines before the middle and end conflict markers?

      From: David Glasser, Date: 2007-11-23, Subject: "prop conflict editing and newlines", http://svn.haxx.se/dev/archive-2007-11/0982.shtml

        Attachments

        1. 1_doit.sh
          3 kB
          David Samuel Glasser

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              glasser David Samuel Glasser
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated: