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

Propchange received on merge of subdir gives rise to conflict

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Critical
    • Resolution: Fixed
    • trunk
    • 1.5.0
    • libsvn_client
    • None

    Description

      A propchange received on a merge of a subdir could give rise to a conflict

      Original issue reported by stylesen

      Attachments

        1. 1_merge-range-test.sh
          1 kB
          Subversion Importer

        Issue Links

          is duplicated by

          Bug - A problem which impairs or prevents the functions of the product. SVN-2971 Reverse merge of prop add segfaults if merging to parent of first merge

          • Blocker - Blocks development and/or testing work, production could not run
          • Closed

          Activity

            People

              Unassigned Unassigned
              subversion-importer Subversion Importer
              Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: