[jira] [Updated] (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:all-tabpanel ] Julian Foad updated SVN-4686: - Fix Version/s: 1.8.x > "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 >Assignee: Julian Foad >Priority: Major > Fix For: 1.8.x, 1.9.x, 1.10.x > > 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)
[jira] [Updated] (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:all-tabpanel ] Julian Foad updated SVN-4686: - Fix Version/s: 1.10.x > "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 >Assignee: Julian Foad >Priority: Major > Fix For: 1.9.x, 1.10.x > > 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)
[jira] [Updated] (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:all-tabpanel ] Julian Foad updated SVN-4686: - Fix Version/s: (was: 1.8.20) (was: 1.9.8) (was: 1.10.0) 1.9.x > "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 >Assignee: Julian Foad >Priority: Major > Fix For: 1.9.x > > 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)
[jira] [Updated] (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:all-tabpanel ] Jens Restemeier updated SVN-4686: - Attachment: mergeinfo-test.c.patch Attempted an automated test for the merge problem. I can't get gmock to work on my machine, though, so I have no idea if it works... > "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 > 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 (v6.4.14#64029)
[jira] [Updated] (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:all-tabpanel ] Jens Restemeier updated SVN-4686: - 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. was: 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 the svn_rangelist_merge2 function that adds changes into rangelist when updating the merged mergeinfo on the root directory: 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. > "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 > Attachments: 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 (v6.4.14#64029)
