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

mergeinfo REPORT requests are ignoring peg revisions

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Critical
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.5.0
    • Component/s: libsvn_ra_neon
    • Labels:
      None

      Description

      This causes merge-tests 63 to fail(though the intension of this test to showcase
      2876).
      I am trying single file merge from /A/D/gamma@4(which is dead at HEAD(r5)) to
      /A_copy/D/gamma.
      
      Here the REPORT request should be 'REPORT
      /svn/merge_tests-63/!svn/bc/4/A/D/gamma HTTP/1.1^M'
      
      <snip of concerned http request/response>
      REPORT /svn/merge_tests-63/A/D/gamma HTTP/1.1^M
      Host: localhost^M
      User-Agent: SVN/1.5.0 (dev build) neon/0.25.5^M
      Connection: TE^M
      TE: trailers^M
      Content-Type: text/xml^M
      Accept-Encoding: gzip^M
      Content-Length: 143^M
      Accept-Encoding: gzip^M
      Authorization: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx^M
      ^M
      Sending request-line and headers:
      Sending request body:
      Body block (143 bytes):
      [<S:mergeinfo-report xmlns:S="svn:">
      <S:revision>1</S:revision><S:inherit>inherited</S:inherit><S:path>/A/D/gamma</S:path></S:mergeinfo-report>
      ]
      Request sent; retry is 1.
      [status-line] < HTTP/1.1 404 Not Found^M
      [hdr] Date: Fri, 24 Aug 2007 09:11:08 GMT^M
      Header Name: [date], Value: [Fri, 24 Aug 2007 09:11:08 GMT]
      </snip>
      
      I have a patch for this.
      
      <snip with my patch for the corresponding operation>
      REPORT /svn/merge_tests-63/!svn/bc/4/A/D/gamma HTTP/1.1^M
      Host: localhost^M
      User-Agent: SVN/1.5.0 (dev build) neon/0.25.5^M
      Connection: TE^M
      TE: trailers^M
      Content-Type: text/xml^M
      Accept-Encoding: gzip^M
      Content-Length: 143^M
      Accept-Encoding: gzip^M
      Authorization: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx^M
      ^M
      Sending request-line and headers:
      Sending request body:
      Body block (143 bytes):
      [<S:mergeinfo-report xmlns:S="svn:">
      <S:revision>4</S:revision><S:inherit>inherited</S:inherit><S:path>/A/D/gamma</S:path></S:mergeinfo-report>
      ]
      Request sent; retry is 1.
      [status-line] < HTTP/1.1 200 OK^M
      </snip>
      
      Once my tests are over I will commit the fix.
      

      Original issue reported by kameshj

        Attachments

        1. 2_2889.patch.txt
          7 kB
          Subversion Importer
        2. 1_2889.patch
          2 kB
          Subversion Importer

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              subversion-importer Subversion Importer
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: