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

svn mergeinfo ignores peg rev for WC target

    XMLWordPrintableJSON

    Details

      Description

      Spun this off from issue #3126.
      
      Given a simple repository with only a handful of revisions...
      
      >svn log -v -r1:HEAD merge_tests-92
      ------------------------------------------------------------------------
      r1 | jrandom | 2008-04-23 11:03:26 -0400 (Wed, 23 Apr 2008) | 1 line
      Changed paths:
         A /A
         A /A/B
         A /A/B/E
         A /A/B/E/alpha
         A /A/B/E/beta
         A /A/B/F
         A /A/B/lambda
         A /A/C
         A /A/D
         A /A/D/G
         A /A/D/G/pi
         A /A/D/G/rho
         A /A/D/G/tau
         A /A/D/H
         A /A/D/H/chi
         A /A/D/H/omega
         A /A/D/H/psi
         A /A/D/gamma
         A /A/mu
         A /iota
      
      Log message for revision 1.
      ------------------------------------------------------------------------
      r2 | jrandom | 2008-04-23 11:03:31 -0400 (Wed, 23 Apr 2008) | 1 line
      Changed paths:
         A /A_COPY (from /A:1)
      
      log msg
      ------------------------------------------------------------------------
      r3 | jrandom | 2008-04-23 11:03:31 -0400 (Wed, 23 Apr 2008) | 1 line
      Changed paths:
         M /A/D/H/psi
      
      log msg
      ------------------------------------------------------------------------
      r4 | jrandom | 2008-04-23 11:03:32 -0400 (Wed, 23 Apr 2008) | 1 line
      Changed paths:
         M /A/D/G/rho
      
      log msg
      ------------------------------------------------------------------------
      r5 | jrandom | 2008-04-23 11:03:33 -0400 (Wed, 23 Apr 2008) | 1 line
      Changed paths:
         M /A/B/E/beta
      
      log msg
      ------------------------------------------------------------------------
      r6 | jrandom | 2008-04-23 11:03:33 -0400 (Wed, 23 Apr 2008) | 1 line
      Changed paths:
         M /A/D/H/omega
      
      log msg
      ------------------------------------------------------------------------
      r7 | pburba | 2008-04-23 11:07:33 -0400 (Wed, 23 Apr 2008) | 1 line
      Changed paths:
         M /A_COPY
         M /A_COPY/B/E/beta
         M /A_COPY/D/G/rho
         M /A_COPY/D/H/omega
         M /A_COPY/D/H/psi
      
      
      ------------------------------------------------------------------------
      
      >svn pl -vR merge_tests-92
      Properties on 'merge_tests-92\A_COPY':
        svn:mergeinfo : /A:2-6
      
      ...It's clear that svn mergeinfo is completely ignoring the peg rev if the
      target is a WC path:
      
      >svn mergeinfo file:///C:/SVN/src-branch/Release/subversion/tests/cmdline/sv
      n-test-work/repositories/merge_tests-92/A merge_tests-92\A_COPY@0
      r3
      r4
      r5
      r6
      
      >svn mergeinfo file:///C:/SVN/src-branch/Release/subversion/tests/cmdline/sv
      n-test-work/repositories/merge_tests-92/A merge_tests-92\A_COPY@999999999999999
      r3
      r4
      r5
      r6
      
      Note: Everything works correctly with a URL target:
      
      >svn mergeinfo
      file:///C:/SVN/src-branch/Release/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-92/A
      file:///C:/SVN/src-branch/Release/sub
      version/tests/cmdline/svn-test-work/repositories/merge_tests-92/A_COPY@0
      ..\..\..\subversion\libsvn_fs_fs\tree.c:690: (apr_err=160013)
      svn: File not found: revision 0, path '/A_COPY'
      
      >svn mergeinfo
      file:///C:/SVN/src-branch/Release/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-92/A
      file:///C:/SVN/src-branch/Release/sub
      version/tests/cmdline/svn-test-work/repositories/merge_tests-92/A_COPY@9999999
      ..\..\..\subversion\libsvn_fs_fs\fs_fs.c:1430: (apr_err=160006)
      svn: No such revision 9999999
      
      >svn mergeinfo
      file:///C:/SVN/src-branch/Release/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-92/A
      file:///C:/SVN/src-branch/Release/sub
      version/tests/cmdline/svn-test-work/repositories/merge_tests-92/A_COPY@6
      
      >svn mergeinfo
      file:///C:/SVN/src-branch/Release/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-92/A
      file:///C:/SVN/src-branch/Release/sub
      version/tests/cmdline/svn-test-work/repositories/merge_tests-92/A_COPY@7
      r3
      r4
      r5
      r6
      
      >
      

        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: