On Thu, Jun 29, 2017 at 3:47 PM, Jens Christian Restemeier
<jens_at_playtonicgames.com> wrote:
> I posted this already to the TortoiseSVN users list, but I think this issue
> may be on the client layer and not the tortoise interface.
>
>
>
> I'm trying to catch up a branch with the changes on trunk. It seems to
> update the correct files, though at the end it fails with
>
> "Unable to parse reversed revision range '19634-19631'"
>
> I'm using TortoiseSVN 1.9.5 on Windows 8.1:
>
> X:\Subversion >svn --version
> svn, version 1.9.5 (r1770682)
>
> I looked both on trunk and the branch for odd mergeinfo. Trunk has no
> mergeinfo newer than the branch (the last merge to it was ages ago). I did a
> search for those revisions on the branch, but they don't appear reversed:
>
> X:\Subversion>svn propget svn:mergeinfo --depth=infinity | find "19631"
>
> /trunk:15014-19472,19473-19612*,19613-19614,19615-19630*,19631-19634,19635-20055*
>
> What exactly is that error message telling me, and how do I resolve it?
>
> I did a google search, but the responses I found were for svn versions from
> years ago, or for svndumps.
>
> I'm tempted to just copy everything over and to hack the mergeinfo manually,
> but I'm sure that'll cause more problems.
>
>
>
> I just tried a “Test” merge in TortoiseSVN and that completed without that
> error.
>
That's quite strange. The error message comes from this line in the source code:
http://svn.apache.org/viewvc/subversion/tags/1.9.5/subversion/libsvn_subr/mergeinfo.c?view=markup#l536
I'm not familiar with that part of the code, but I can only imagine
that somehow this reversed range gets processed during the merge
operation.
Can you reproduce this with commandline svn, and get the same error
message that way? If so, can you give the exact command?
I still think this reversed range is somewhere present in the
svn:mergeinfo property, where it shouldn't be.
--
Johan
Received on 2017-06-29 22:56:08 CEST