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

Committing a subtree doesn't commit inherited mergeinfo

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Open
    • Major
    • Resolution: Unresolved
    • trunk
    • ---
    • unknown

    Description

      After merging into a WC, committing a subtree of the merge root results in a new
      revision that contains the content changes merged into that subtree but no
      updated mergeinfo to describe those changes.
      
      This is unexpected behaviour and a potential source of later problems.
      
      Example, where 'wc' is the local WC root directory and 'A' is the merge root
      directory:
      
      1. Merge a change into 'wc/A' that affects 'wc/A/f', where the mergeinfo is
      recorded on 'wc/A' and not on 'wc/A/f'.
      
      2. Commit the subtree 'wc/A/f'.
      
      Actual result: The committed 'f' does not have the updated mergeinfo.
      
      Expected result: Either the committed 'f' should be given explicit mergeinfo and
      then committed, or the commit attempt should fail because it would produce an
      unexpected result.
      

      Attachments

        Activity

          People

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

            Dates

              Created:
              Updated: