Re: svn status merges intersected external records into single row

2017-06-29 Thread Johan Corveleyn
On Fri, Jun 30, 2017 at 4:12 AM, Daniel Shahaf wrote: > Johan Corveleyn wrote on Fri, 30 Jun 2017 00:06 +0200: >> Summarized, you're saying that with this svn:externals definition: >> >> ^/dir1/dir1_subdir1 ext/dir1_subdir1 >> ^/dir1/dir1_subdir2 ext/dir1_subdir2 >> >> (with ext being an u

Re: Merging file to file requires specifying source file by its URL

2017-06-29 Thread Branko Čibej
On 30.06.2017 06:04, Daniel Shahaf wrote: > I'm trying to merge trunk/CHANGES into branches/1.9.x/CHANGES. I have > two separate working copies: the current directory (./) is a working > copy of branches/1.9.x and ../wc-of-trunk is a working copy of /trunk. > When I try the sync merge syntax with

Merging file to file requires specifying source file by its URL

2017-06-29 Thread Daniel Shahaf
I'm trying to merge trunk/CHANGES into branches/1.9.x/CHANGES. I have two separate working copies: the current directory (./) is a working copy of branches/1.9.x and ../wc-of-trunk is a working copy of /trunk. When I try the sync merge syntax with file targets, I get an error: . $ svn merge ..

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

2017-06-29 Thread Daniel Shahaf
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: svn status merges intersected external records into single row

2017-06-29 Thread Daniel Shahaf
Johan Corveleyn wrote on Fri, 30 Jun 2017 00:06 +0200: > Summarized, you're saying that with this svn:externals definition: > > ^/dir1/dir1_subdir1 ext/dir1_subdir1 > ^/dir1/dir1_subdir2 ext/dir1_subdir2 > > (with ext being an unversioned intermediate directory) > running 'svn status' onl

Re: svn status merges intersected external records into single row

2017-06-29 Thread Johan Corveleyn
On Tue, Jun 13, 2017 at 3:47 PM, Andrey wrote: > Here is the batch script for the windows: > > ``` > @echo off > > set REPODIR=test_repo > set "REPOROOT=%~dp0%REPODIR%" > set "REPOURL=file:///%REPOROOT:\=/%" > set WCROOT=%REPODIR%_root > > if exist "%REPOROOT%\" rmdir /S /Q "%REPOROOT%" > if exist

Re: Checksum Mismatch Error on checkout, update, commit

2017-06-29 Thread Johan Corveleyn
On Tue, Jun 20, 2017 at 7:47 AM, Nishanth A wrote: > > Hi, > > Getting following errors while checkout the code. Better to copy-paste the text of the error message in your mail, instead of (or in addition of) a screenshot. Anyway, your mail lacks a lot of detail for us to be able to help you. Mo

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

2017-06-29 Thread Johan Corveleyn
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

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

2017-06-29 Thread Jens Christian Restemeier
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 re