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

2017-07-04 Thread Daniel Shahaf
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

2017-07-04 Thread Jens Christian Restemeier
I ran "make tests", which fails for undefined references to gmock... I'll try your instructions. I didn’t think you would look at this right away... :) -Original Message- From: Daniel Shahaf [mailto:d...@daniel.shahaf.name] Sent: 04 July 2017 15:01 To: Jens Christian Restemeier Cc: Joha

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

2017-07-04 Thread Daniel Shahaf
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

2017-07-04 Thread Jens Christian Restemeier
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... It looks like the URL for gmock has changed since get-deps.sh was written, and it is not distributed as fused files. Instead of building the rangelists it uses svn_rangeli

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

2017-07-04 Thread Jens Christian Restemeier
Just a quick update: I specified the range to merge from trunk manually and the merge completed without error. Looking at the mergeinfo property svn correctly extended the last revision range. -Original Message- From: Jens Christian Restemeier [mailto:j...@playtonicgames.com] Sent: 04 J

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

2017-07-04 Thread Jens Christian Restemeier
You are correct, it is a sparse workspace directory, so I assume any merge touching the excluded directories is marked as non-recursive. The merge is a plain merge from trunk, so the "changes" range starts at the same revision as the rangelist (15014) and goes up to the then-current revision on

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

2017-07-04 Thread Bert Huijben
> -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 revision range" when merging from > trunk to br