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

"Unable to parse reversed revision range '19634-19631'"

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 1.9.5
    • Fix Version/s: 1.8.x, 1.9.x, 1.10.x
    • Component/s: cmdline client
    • Labels:
      None
    • Environment:

      Windows 8.1 + TortoiseSVN 1.9.5
      Debian Linux + Subversion 1.9.5

      Description

      I'm trying to catch up a branch with the changes on trunk.

      The command line is:
      svn merge ^/trunk

      Updating records only shows the same problem:
      svn merge ^/trunk --record-only

      Running a dry run doesn't show the problem:
      svn merge ^/trunk --dry-run

      It seems to update the correct files, though at the end it fails with

      "Unable to parse reversed revision range '19634-19631'"

      Digging into the source of the svn client this seems to be caused by svn_rangelist_merge2:

      Input rangelist: 15014-19472,19473-19612*,19613-19614,19615-19630*,19631-19634,19635-20055*
      Input changes: 15014-20515*
      Output rangelist: 15014-19472,19473-19612*,19613-19614,19615-19630*,19634-19631*,19631-19634,19635-20515*

      This happens inside the adjust_remaining_ranges function which seems to insert a new range into the wrong position, causing next_range to start before modified_range.

        Attachments

        1. mergeinfo-test.c.patch
          3 kB
          Jens Restemeier
        2. mergetest.c
          3 kB
          Jens Restemeier

          Activity

            People

            • Assignee:
              julianfoad Julian Foad
              Reporter:
              jens.restemeier Jens Restemeier
            • Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: