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

'svn mergeinfo' won't work on moved target

    XMLWordPrintableJSON

    Details

      Description

      Merge and mergetracking work fine on a moved target
      (Assume A_COPY is a branch of ^/A):
      
      >svn move A_COPY branch
      A         branch
      D         A_COPY
      D         A_COPY\B
      D         A_COPY\B\E
      D         A_COPY\B\E\alpha
      D         A_COPY\B\E\beta
      D         A_COPY\B\F
      D         A_COPY\B\lambda
      D         A_COPY\C
      D         A_COPY\D
      D         A_COPY\D\G
      D         A_COPY\D\G\pi
      D         A_COPY\D\G\rho
      D         A_COPY\D\G\tau
      D         A_COPY\D\H
      D         A_COPY\D\H\chi
      D         A_COPY\D\H\omega
      D         A_COPY\D\H\psi
      D         A_COPY\D\gamma
      D         A_COPY\mu
      
      >svn merge ^^/A branch
      --- Merging r2 through r8 into 'branch':
      U    branch\B\E\beta
      U    branch\D\G\rho
      U    branch\D\H\omega
      U    branch\D\H\psi
      --- Recording mergeinfo for merge of r2 through r8 into 'branch':
       U   branch
      
      But 'svn mergeinfo' doesn't work in the same scenario:
      
      >svn revert -Rq .
      
      >svn move A_COPY branch -q
      
      >svn mergeinfo ^^/A branch
      ..\..\..\subversion\svn\mergeinfo-cmd.c:313: (apr_err=160013)
      svn: E160013: Source and target must be different but related branches
      ..\..\..\subversion\svn\util.c:1044: (apr_err=160013)
      ..\..\..\subversion\libsvn_client\ra.c:973: (apr_err=160013)
      ..\..\..\subversion\libsvn_client\ra.c:891: (apr_err=160013)
      ..\..\..\subversion\libsvn_client\mergeinfo.c:767: (apr_err=160013)
      ..\..\..\subversion\libsvn_client\ra.c:597: (apr_err=160013)
      ..\..\..\subversion\libsvn_ra_serf\getlocationsegments.c:204: (apr_err=160013)
      ..\..\..\subversion\libsvn_ra_serf\util.c:2387: (apr_err=160013)
      svn: E160013: '/svn-test-work/repositories/merge_tests-134/!svn/rvr/8/branch'
      path not found
      

        Attachments

          Activity

            People

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

              Dates

              • Created:
                Updated:
                Resolved: