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

Merge with much subtree mergeinfo takes hours

    XMLWordPrintableJSON

    Details

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

      Description

      When there is explicit mergeinfo on thousands of subtrees, a merge at the subtree root can take several hours.

      The merge code makes multiple (4 in my test) synchronous svn_ra_get_location_segments() queries to the server for each subtree with mergeinfo. If, for example, 3600 subtrees have mergeinfo and each query takes 0.25 second, that adds up to an hour.

      This is related to but different from the memory usage issue SVN-4667. The results of most of these queries are stored temporarily and account for only 10% of the total memory used in my test.

      Possible approaches to improving the merge code are: (1) make the queries much more efficient; and (2) analyse how the results are used and eliminate unnecessary queries.

      The work-flow approach to improving the experience is: get the number of subtrees with mergeinfo down to none or very few.

      (WANdisco's internal issue id: SVNB-1952.)

        Attachments

          Issue Links

            Activity

              People

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

                Dates

                • Created:
                  Updated: