"Unable to parse reversed revision range" when merging from trunk to branch

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 >s​vn --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,1​9473-19612*,19613-19​614,19615-19630*,196​31-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.

Cheers,

Jens

 
Received on 2017-06-29 15:47:18 CEST