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

"SVN-4635: Cherry-pick merge scenario causes Svn to choke" June 11th, 2016 Ponymail isn't letting me go back more than a month, so I can't give you a link to the thread - sorry.

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

, but perhaps I missed the earlier discussion. Bert From: Paul Hammant [mailto:p...@hammant.org] Sent: vrijdag 7 juli 2017 13:25 To: Jens Restemeier Cc: Stefan Sperling ; Johan Corveleyn ; users@subversion.apache.org Subject: Re: "Unable to parse reversed revision range&

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

> Done: https://issues.apache.org/jira/browse/SVN-4686 > > Jumping in with something that's in the same area - https://issues.apache.org/jira/browse/SVN-4635 is a merge tracking (or merge info/range props) bug that is still there in v1.9.6, in case anyone wants a scripted reproduction (30 seconds o

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

Branko Čibej wrote on Wed, 05 Jul 2017 09:31 +0200: > On 04.07.2017 16:33, Daniel Shahaf wrote: > > Jens Christian Restemeier wrote on Tue, 04 Jul 2017 15:10 +0100: > >> I ran "make tests", which fails for undefined references to gmock... > > The build.conf stanzas for the cxxhl bindings declare th

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

On 04.07.2017 16:33, Daniel Shahaf wrote: > Jens Christian Restemeier wrote on Tue, 04 Jul 2017 15:10 +0100: >> I ran "make tests", which fails for undefined references to gmock... > The build.conf stanzas for the cxxhl bindings declare them as «install = > tests», which causes a «make tests» targe

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

Jens Christian Restemeier wrote on Tue, 04 Jul 2017 15:10 +0100: > I ran "make tests", which fails for undefined references to gmock... The build.conf stanzas for the cxxhl bindings declare them as «install = tests», which causes a «make tests» target to be created for compiling and running the cx

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

Restemeier Cc: Johan Corveleyn ; users@subversion.apache.org; Stefan Sperling Subject: Re: "Unable to parse reversed revision range" when merging from trunk to branch Jens Christian Restemeier wrote on Tue, 04 Jul 2017 14:43 +0100: > I attached an patch with a test to the bug. I ca

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

Jens Christian Restemeier wrote on Tue, 04 Jul 2017 14:43 +0100: > I attached an patch with a test to the bug. I can't get gmock to work at the > moment, so I have no idea if this test works... gmock is not required for running the tests; you only need python 2.7. To run a single test, the invoca

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

d revision range" when merging from trunk to branch Jens Restemeier wrote on Mon, 03 Jul 2017 20:01 +0100: > > Am 03.07.2017 um 19:17 schrieb Stefan Sperling : > > > > On Mon, Jul 03, 2017 at 03:31:00PM +0100, Jens Christian Restemeier wrote: > >> Should I ope

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

July 2017 11:01 To: 'Bert Huijben' ; 'Johan Corveleyn' Cc: 'Stefan Sperling' ; 'users@subversion.apache.org' Subject: RE: "Unable to parse reversed revision range" when merging from trunk to branch You are correct, it is a sparse workspace direc

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

; ; 'Johan Corveleyn' Cc: 'Stefan Sperling' ; users@subversion.apache.org Subject: RE: "Unable to parse reversed revision range" when merging from trunk to branch > -Original Message- > From: Jens Christian Restemeier [mailto:j...@playtonicgames.com]

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

> -Original Message- > From: Jens Christian Restemeier [mailto:j...@playtonicgames.com] > Sent: maandag 3 juli 2017 16:31 > To: 'Johan Corveleyn' > Cc: 'Stefan Sperling' ; users@subversion.apache.org > Subject: RE: "Unable to parse reversed r

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

Jens Restemeier wrote on Mon, 03 Jul 2017 20:01 +0100: > > Am 03.07.2017 um 19:17 schrieb Stefan Sperling : > > > > On Mon, Jul 03, 2017 at 03:31:00PM +0100, Jens Christian Restemeier wrote: > >> Should I open a bug with my findings and the test case? > > > > Yes, please open a bug in the issue t

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

Done: https://issues.apache.org/jira/browse/SVN-4686 > Am 03.07.2017 um 19:17 schrieb Stefan Sperling : > > On Mon, Jul 03, 2017 at 03:31:00PM +0100, Jens Christian Restemeier wrote: >> Should I open a bug with my findings and the test case? > > Y

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

On Mon, Jul 03, 2017 at 03:31:00PM +0100, Jens Christian Restemeier wrote: > Should I open a bug with my findings and the test case? Yes, please open a bug in the issue tracker. A regression test for the subversion/tests tree would be essential. Since you already wrote a test program in C, this f

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

de most likely fixes... So how should I proceed from here? Should I open a bug with my findings and the test case? -Original Message- From: Jens Restemeier [mailto:j...@playtonicgames.com] Sent: 02 July 2017 23:44 To: Johan Corveleyn Cc: Stefan Sperling ; users@subversion.apache.org

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

The problem seems to come from svn_rangelist_merge2. This test program recreates the problem. #include #include int main(int argc, char * argv[]) { apr_pool_t *pool; int exit_code = EXIT_SUCCESS; svn_error_t *err; if (svn_cmdline_init("svn", stderr) != EXIT_SUCCESS)

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

On Fri, Jun 30, 2017 at 6:10 PM, Jens Christian Restemeier wrote: > I narrowed it down to somewhere in update_wc_mergeinfo. At the start of the > function where it gets the mergeinfo for the root directory it is: > /trunk:15014-19472,19473-19612*,19613-19614,19615-19630*,19631-19634,19635-2 > 0055

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

14:10 To: Jens Christian Restemeier Cc: 'Johan Corveleyn' ; users@subversion.apache.org Subject: Re: "Unable to parse reversed revision range" when merging from trunk to branch On Fri, Jun 30, 2017 at 01:59:02PM +0100, Jens Christian Restemeier wrote: > I can add some diagn

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

On Fri, Jun 30, 2017 at 01:59:02PM +0100, Jens Christian Restemeier wrote: > I can add some diagnostics to the mergeinfo parser, though I've got some work > to finish first. Please do. Don't forget to pack a pickaxe, a torch, and some elixirs to restore HP.

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

I made a clean checkout of the same branch onto my Linux machine, to make sure the workspace doesn't contain any odd leftover data. The workspace is sparse, it excludes a few folders at the root level contain only data that is irrelevant for code work. It's the same checkout as on my Windows ma

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

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

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

On Thu, Jun 29, 2017 at 3:47 PM, Jens Christian Restemeier 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 c