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

'svn up' may cause inconsistent mergeinfo

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: trunk
    • Fix Version/s: ---
    • Component/s: libsvn_client
    • Labels:
      None

      Description

      Stefan Fuhrmann reported:
      
      There is yet another problem with sub-tree mergeinfo:
      
      (1) User A performs a sub-tree merge causing the mi property
        to be added to the sub-node. No commit, yet.
      (2) User B commits a merge at the branch root, modifying its m/i.
      (3) User A updates and commits their merge.
      
      Now, the sub-tree mergeinfo does not reflect the changes
      made to the root node m/i. If the latter are operative on that
      sub-tree, the data is inconsistent and can create conflicts.
      
      See the dev@ email thread "'svn up' may cause inconsistent mergeinfo" started on
      2014-12-11, archived at e.g. <http://svn.haxx.se/dev/archive-2014-12/0065.shtml>
      or
      <http://mail-archives.apache.org/mod_mbox/subversion-dev/201412.mbox/%3CCA+t0gk3tfr-qycN6ppPP3UY5aykaERU-64nfTi9nKS0b7pZR2A@mail.gmail.com%3E>.
      

        Attachments

        1. 1_mergeinfo-inconsistency.sh
          1 kB
          Julian Foad

          Activity

            People

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

              Dates

              • Created:
                Updated: