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

Tree conflicts: check that properties match when checking that text matches.

    XMLWordPrintableJSON

    Details

      Description

      In tree conflict detection, operations like rename and delete are allowed
      without conflict if the target file exactly matches the "source-left" file. When
      checking for "exact match", the file's properties should be checked as well as
      its text content. (Probably not the "svn:mergeinfo" property, though?)
      

      http://svn.collab.net/repos/svn/branches/tree-conflicts/

        Attachments

          Issue Links

            Activity

              People

              • Assignee:
                Unassigned
                Reporter:
                julianfoad Julian Foad
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: