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

spurious property conflict during reintegrate merge

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.7.0
    • Component/s: unknown
    • Labels:
      None

      Description

      The attached script causes a property conflict when merging a branch back into
      trunk, even though the property values are exactly the same.
      Subversion should not flag a conflict in this situation.
      
      Reported by Brian Neal in this thread:
      http://svn.haxx.se/users/archive-2011-06/0106.shtml
      

        Attachments

        1. 1_issue-3919.sh
          1.0 kB
          Stefan Sperling

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              stsp Stefan Sperling
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: