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

Improve handling for skipped paths encountered during a merge

    XMLWordPrintableJSON

Details

    • Improvement
    • Status: Closed
    • Major
    • Resolution: Fixed
    • trunk
    • 1.5.0
    • libsvn_client

    Description

      The original idea here goes something as follows:
      
      If only some changes are skipped, merge info should be recorded
      for the target (implemented in r25085), and recorded as empty (or
      with no modifications, if there is pre-existing merge info) for
      the skipped items.
      
      We may want to tweak this behavior a bit.
      

      Attachments

        1. 3_2829-1.patch
          6 kB
          Subversion Importer
        2. 2_2829.patch
          4 kB
          Subversion Importer
        3. 1_merge-test-2829-1.sh
          2 kB
          Subversion Importer

        Issue Links

          Activity

            People

              Unassigned Unassigned
              dlr Daniel Rall
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: