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

svn_client_mergeinfo_log API is broken

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Critical
    • Resolution: Fixed
    • Affects Version/s: 1.7.x
    • Fix Version/s: 1.7.0
    • Component/s: libsvn_client
    • Labels:
      None

      Description

      As discussed here, http://svn.haxx.se/dev/archive-2011-08/0101.shtml,
      svn_client_mergeinfo_log is providing the wrong answers when the target is a
      working copy which has inherited mergeinfo, but the repository must be contacted
      to obtain it (i.e. the WC path with the inherited mergeinfo is not present,
      mixed-rev working copy prevents inheritance).
      
      A simple example:
      
      ### Given this wc, the root of which has no explicit mergeinfo of
      ### its own, but inherits some from the repository:
      
      >svn up
      Updating '.':
      At revision 7.
      
      >svn info
      Path: .
      Working Copy Root Path:
      C:\SVN\src-trunk\Debug\subversion\tests\cmdline\svn-test-work\working_copies\mergeinfo_tests-1.D_COPY
      URL:
      file:///C:/SVN/src-trunk/Debug/subversion/tests/cmdline/svn-test-work/repositories/mergeinfo_tests-1/A_COPY/D
      Repository Root:
      file:///C:/SVN/src-trunk/Debug/subversion/tests/cmdline/svn-test-work/repositories/mergeinfo_tests-1
      Repository UUID: 6b963ef7-7a96-3b4d-8aa0-98e92c13f837
      Revision: 7
      Node Kind: directory
      Schedule: normal
      Last Changed Author: jrandom
      Last Changed Rev: 7
      Last Changed Date: 2011-08-10 10:33:24 -0400 (Wed, 10 Aug 2011)
      
      
      ### ^^/A_COPY/D@7 should inherit '/A/D:6' the repostory...
      
      >svn pg svn:mergeinfo -vR ^^/
      Properties on
      'file:///C:/SVN/src-trunk/Debug/subversion/tests/cmdline/svn-test-work/repositories/mergeinfo_tests-1/A_COPY':
        svn:mergeinfo
          /A:6
      Properties on
      'file:///C:/SVN/src-trunk/Debug/subversion/tests/cmdline/svn-test-work/repositories/mergeinfo_tests-1/A_COPY/D/G/rho':
        svn:mergeinfo
          /A/D/G/rho:4
      
      ### But 'svn mergeinfo' is not getting this info and shows r6 as
      ### still eligible for merging:
      
      >svn mergeinfo --show-revs eligible -R ^^/A/D
      r3
      r6
      
      ### We can work around this problem by using a target URL:
      
      >svn mergeinfo --show-revs eligible -R ^^/A/D ^^/A_COPY/D
      r3
      
      But that isn't much help since the bug is quite subtle; it's not as if we get an
      error message!
      

        Attachments

          Activity

            People

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

              Dates

              • Created:
                Updated:
                Resolved: