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

'log -g' merge determination logic faulty

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Open
    • Major
    • Resolution: Unresolved
    • 1.5.x
    • unscheduled
    • libsvn_repos
    • None

    Description

      While thinking (and thinking ... and thinking ...) about issue #3220 last week,
      I stumbled upon a belief that not only was our "how did the mergeinfo change"
      logic highly inefficient, but that the approach might be also incorrect.
      
      The algorithm today is pretty basic:
         - fetch mergeinfo in the previous revision
         - fetch mergeinfo in the current revision
         - compare, contrast, and combine
      
      But this is far too naive.  A simple use-case that causes wrong results was easy
      to find: deletion of a subtree inside which there lives some mergeinfo.
      

      Attachments

        1. 1_log-g-bug-recipe.sh
          10 kB
          C. Michael Pilato
        2. 2_issue3235.dump
          7 kB
          Paul Burba
        3. 3_issue.3235.desc9.fix.diff
          2 kB
          Paul Burba

        Issue Links

          Activity

            People

              Unassigned Unassigned
              cmpilato C. Michael Pilato
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated: