Round 2: Merge error with mixed-revisions but subsequent "svn update" doesn't fix it

2016-03-09 Thread webster.brent
.mbox/%3C1820009612.5161618.1457534793008.JavaMail.yahoo%40mail.yahoo.com%3E When the merge issue: 'svn: E195020: Cannot merge into mixed-revision working copy [8:9775]; try updating first" raised its ugly head again. Running a"svn update' don't solve the merge error. The svn

RE: svn: E195016: merge error is dropping last character of path

2013-10-29 Thread Andrew Reedick
> -Original Message- > From: Andrew Reedick > Sent: Wednesday, September 11, 2013 9:19 AM > To: users@subversion.apache.org > Subject: svn: E195016: merge error is dropping last character of path > > So... any reason why the last character in paths are getting dropp

Re: svn: E195016: merge error is dropping last character of path

2013-09-14 Thread Ivan Zhakov
On Wed, Sep 11, 2013 at 5:19 PM, Andrew Reedick wrote: > So... any reason why the last character in paths are getting dropped in the > "Missing ranges: " output? > > Ex: the "k" is missing from "trunk" in "Missing ranges: > portal/trunk > Missing ranges: > /portal/trun:4125,4143,4145,41

svn: E195016: merge error is dropping last character of path

2013-09-11 Thread Andrew Reedick
So... any reason why the last character in paths are getting dropped in the "Missing ranges: " output? Ex: the "k" is missing from "trunk" in "Missing ranges: portal/trunk Missing ranges: /portal/trun:4125,4143,4145,4147,4150,4163,4166,4168,4170,4209,4217,4222,4252,4277,4282,4300,4364

Re: Merge error with SVN 1.8.0

2013-07-05 Thread Branko Čibej
On 05.07.2013 23:04, Alexey Neyman wrote: > My point was that the problem is most likely not a *packaging* issue, > which was confirmed in my next message (the issue is due to 1.8.x > making more connections from client to server when doing 'svn merge'). That's most likely a side effect of the imp

Re: Merge error with SVN 1.8.0

2013-07-05 Thread Alexey Neyman
On Sunday, June 30, 2013 04:33:45 PM Branko Čibej wrote: > On 24.06.2013 01:38, Alexey Neyman wrote: > > Are you calling RPMs provided by WanDisco's "fun and games"? I think > > Subversion developers employed by WanDisco might be somewhat insulted > > by such judgment. > > Hmm I'd sooner be i

Re: Merge error with SVN 1.8.0

2013-07-05 Thread Alexey Neyman
On Saturday, June 29, 2013 01:18:16 PM Stefan Sperling wrote: > On Fri, Jun 28, 2013 at 03:36:38PM -0700, Alexey Neyman wrote: > > [copying dev@ because I found what the issue is] > > > > Hi, > > > > Did some further investigation and it turns out that SVN1.8 client creates > > more connections t

Re: Merge error with SVN 1.8.0

2013-06-30 Thread Branko Čibej
On 24.06.2013 01:38, Alexey Neyman wrote: > > Are you calling RPMs provided by WanDisco's "fun and games"? I think > Subversion developers employed by WanDisco might be somewhat insulted > by such judgment. > Hmm I'd sooner be insulted by someone anticipating my reaction like that. :) Nobody

Re: Merge error with SVN 1.8.0

2013-06-30 Thread Nico Kadel-Garcia
On Sun, Jun 23, 2013 at 7:38 PM, Alexey Neyman wrote: > On Sunday, June 23, 2013 07:20:50 PM Nico Kadel-Garcia wrote: > >> On Sun, Jun 23, 2013 at 3:56 PM, Alexey Neyman wrote: > >> > Hi, > >> > > >> > > >> > > >> > I've tried upgrading the client to SVN 1.8, and now see some strange >> > merge >

Re: Merge error with SVN 1.8.0

2013-06-29 Thread Stefan Sperling
On Fri, Jun 28, 2013 at 03:36:38PM -0700, Alexey Neyman wrote: > [copying dev@ because I found what the issue is] > > Hi, > > Did some further investigation and it turns out that SVN1.8 client creates > more > connections to the server when performing 'svn merge' - exceeding the > xinetd's >

Re: Merge error with SVN 1.8.0

2013-06-28 Thread Alexey Neyman
[copying dev@ because I found what the issue is] Hi, Did some further investigation and it turns out that SVN1.8 client creates more connections to the server when performing 'svn merge' - exceeding the xinetd's default number of connections per source (10) and indeed, closing the connection o

Re: Merge error with SVN 1.8.0

2013-06-23 Thread Alexey Neyman
On Sunday, June 23, 2013 07:20:50 PM Nico Kadel-Garcia wrote: > On Sun, Jun 23, 2013 at 3:56 PM, Alexey Neyman wrote: > > Hi, > > > > > > > > I've tried upgrading the client to SVN 1.8, and now see some strange merge > > errors while reintegrating the branch. According to > > Did you delete th

Re: Merge error with SVN 1.8.0

2013-06-23 Thread Nico Kadel-Garcia
On Sun, Jun 23, 2013 at 3:56 PM, Alexey Neyman wrote: > Hi, > > > > I've tried upgrading the client to SVN 1.8, and now see some strange merge > errors while reintegrating the branch. According to Did you delete the old RHEL 1.6.11 RPM, to avoid libraries lying around and confusing you? Or binari

Merge error with SVN 1.8.0

2013-06-23 Thread Alexey Neyman
Hi, I've tried upgrading the client to SVN 1.8, and now see some strange merge errors while reintegrating the branch. According to http://subversion.apache.org/docs/release-notes/1.8.html#auto-reintegrate the --reintegrate option is now deprecated, its use is discouraged and SVN should be

Re: Merge Error

2013-01-10 Thread Stefan Sperling
On Thu, Jan 10, 2013 at 09:32:39AM -0600, Chris Meyer wrote: > I get the following error when trying to use the merge tool, when choosing > 'Merge a range of revisions', enter the url to merge from, then push 'Show > log' or even if I push next and then 'Test Merge', I get the same error. > For som

Merge Error

2013-01-10 Thread Chris Meyer
I get the following error when trying to use the merge tool, when choosing 'Merge a range of revisions', enter the url to merge from, then push 'Show log' or even if I push next and then 'Test Merge', I get the same error. For some reason it keeps telling me that my local temp folder is not a worki

merge error

2011-12-07 Thread Péter SZABADY
Hi! I chose the "Merge a range of revisions". "Revision range to merge": 210990-210991. Merge depth: "Working copy", and I selected "Compare whitespaces". This error always occurs. --- Subversion Exception! --- Subversion encountered a serious prob