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

Parsing error with reverse merges and non-inheritable mergeinfo

    XMLWordPrintableJSON

    Details

      Description

      If we have a merge target with a non-inheritable revision N and the target has
      children with explicit mergeinfo including revision N, then we get a mergeinfo
      parsing error when reverse merging -N to the target:
      
      trunk>svn st -v merge_tests-62\A_COPY_2\D
                      13       13 pburba       merge_tests-62\A_COPY_2\D
                      13        3 jrandom      merge_tests-62\A_COPY_2\D\gamma
                      13        3 jrandom      merge_tests-62\A_COPY_2\D\G
                      13        3 jrandom      merge_tests-62\A_COPY_2\D\G\pi
                      13        3 jrandom      merge_tests-62\A_COPY_2\D\G\rho
                      13        3 jrandom      merge_tests-62\A_COPY_2\D\G\tau
                      13       13 pburba       merge_tests-62\A_COPY_2\D\H
                      13        3 jrandom      merge_tests-62\A_COPY_2\D\H\chi
                      13       13 pburba       merge_tests-62\A_COPY_2\D\H\omega
                      13       13 pburba       merge_tests-62\A_COPY_2\D\H\psi
      
      trunk>svn pl -vR merge_tests-62\A_COPY_2
      Properties on 'merge_tests-62\A_COPY_2\D':
        svn:mergeinfo
          /A/D:4,7*
      Properties on 'merge_tests-62\A_COPY_2\D\H':
        svn:mergeinfo
          /A/D/H:4,7
      
      trunk>svn merge %url%/A/D merge_tests-62\A_COPY_2\D -c-7
      --- Reverse-merging r7 into 'merge_tests-62\A_COPY_2\D\H':
      U    merge_tests-62\A_COPY_2\D\H\omega
      ..\..\..\subversion\libsvn_subr\mergeinfo.c:590: (apr_err=200020)
      svn: Could not parse mergeinfo string '4,-7'
      ..\..\..\subversion\libsvn_subr\kitchensink.c:52: (apr_err=200022)
      svn: Negative revision number found parsing '-7'
      
      Test coming up shortly.
      

        Attachments

          Activity

            People

            • Assignee:
              pburba Paul Burba
              Reporter:
              pburba Paul Burba
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: