You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@subversion.apache.org by "Julian Foad (JIRA)" <ji...@apache.org> on 2018/02/05 16:05:00 UTC
[jira] [Commented] (SVN-4686) "Unable to parse reversed revision
range '19634-19631'"
[ https://issues.apache.org/jira/browse/SVN-4686?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16352582#comment-16352582 ]
Julian Foad commented on SVN-4686:
----------------------------------
Fixed in r1823203 (on trunk).
> "Unable to parse reversed revision range '19634-19631'"
> -------------------------------------------------------
>
> Key: SVN-4686
> URL: https://issues.apache.org/jira/browse/SVN-4686
> Project: Subversion
> Issue Type: Bug
> Components: cmdline client
> Affects Versions: 1.9.5
> Environment: Windows 8.1 + TortoiseSVN 1.9.5
> Debian Linux + Subversion 1.9.5
> Reporter: Jens Restemeier
> Priority: Major
> Attachments: mergeinfo-test.c.patch, mergetest.c
>
>
> 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.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)