[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Fri, 30 Jun 2017 02:17:44 +0000

Johan Corveleyn wrote on Thu, 29 Jun 2017 22:55 +0200:
> On Thu, Jun 29, 2017 at 3:47 PM, Jens Christian Restemeier
> <jens_at_playtonicgames.com> wrote:
> > X:\Subversion>svn propget svn:mergeinfo --depth=infinity | find "19631"
> >
> > /trunk:15014-19472,19473-19612*,19613-19614,19615-19630*,19631-19634,19635-20055*
> 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.

> I still think this reversed range is somewhere present in the
> svn:mergeinfo property, where it shouldn't be.

Unless 'svn merge' has learnt to look for svn:mergeinfo above the cwd
(which appears to be a wc root in this case) or below cropped subtrees,
the natural place to look for the reversed ranged would be in
svn:mergeinfo of the tree being merged. (The one passed to 'svn merge'
as a positional argument.)
Received on 2017-06-30 04:17:57 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.