Re: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs

2015-03-27 Thread Pete Harlan
On Fri, Mar 27, 2015 at 2:27 PM, Johan Corveleyn wrote: > On Fri, Mar 27, 2015 at 9:01 PM, Pete Harlan wrote: >> On Tue, Mar 24, 2015 at 11:24 AM, Pete Harlan wrote: >>> Is it accurate then to say that Subversion may generate explicit >>> mergeinfo whenever it decides that there is something use

Re: unlocking a svn:needs-lock file

2015-03-27 Thread Branko Čibej
On 27.03.2015 17:04, Andrew Schwartz wrote: > Hi, > > I'm using svn on Windows. > > If a file with the svn:needs-lock property is currently locked and is > locally modified, I think that 'svn unlock' should fail. I'm seeing > it happily succeed. This is not a bug. http://svnbook.red-bean.com/en/

Re: unlocking a svn:needs-lock file

2015-03-27 Thread Johan Corveleyn
On Fri, Mar 27, 2015 at 5:04 PM, Andrew Schwartz wrote: > Hi, > > I'm using svn on Windows. > > If a file with the svn:needs-lock property is currently locked and is > locally modified, I think that 'svn unlock' should fail. I'm seeing it > happily succeed. I see no problem with that. The svn:ne

Re: issues after updating one client to version 1.8

2015-03-27 Thread Joan Baiges
Dear Johan, Thank you for your response, I will check the server side error log . Kind regards, Joan El dia 27/03/2015 22:33, "Johan Corveleyn" va escriure: > On Fri, Mar 27, 2015 at 10:11 PM, Johan Corveleyn > wrote: > > On Fri, Mar 27, 2015 at 8:05 PM, Joan Baiges > wrote: > >> Dear all, > >>

Re: issues after updating one client to version 1.8

2015-03-27 Thread Johan Corveleyn
On Fri, Mar 27, 2015 at 10:11 PM, Johan Corveleyn wrote: > On Fri, Mar 27, 2015 at 8:05 PM, Joan Baiges wrote: >> Dear all, >> We are using svn 1.6 as a server, and most of my teammates are also using >> svn 1.6. I recently upgraded to 1.8 and after a merge operation from my 1.8 >> client several

Re: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs

2015-03-27 Thread Johan Corveleyn
On Fri, Mar 27, 2015 at 9:01 PM, Pete Harlan wrote: > On Tue, Mar 24, 2015 at 11:24 AM, Pete Harlan wrote: >> Is it accurate then to say that Subversion may generate explicit >> mergeinfo whenever it decides that there is something useful to record >> about the set of revisions that contributed t

Re: issues after updating one client to version 1.8

2015-03-27 Thread Johan Corveleyn
On Fri, Mar 27, 2015 at 8:05 PM, Joan Baiges wrote: > Dear all, > We are using svn 1.6 as a server, and most of my teammates are also using > svn 1.6. I recently upgraded to 1.8 and after a merge operation from my 1.8 > client several issues have arised: > - My colleagues (svn client 1.6) are unab

Branching slow 1.8.11 https

2015-03-27 Thread Johan Corveleyn
Does the following ring a bell for someone? Recently upgraded our server (on Solaris 10 SPARC) from 1.5.4 to 1.8.11 (CollabNet package). Some time after that, we discovered that branching was very slow. I'm talking about pure server-side branching ('svn copy $URL/trunk $URL/branches/br1'). I'm tes

Re: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs

2015-03-27 Thread Pete Harlan
On Tue, Mar 24, 2015 at 11:24 AM, Pete Harlan wrote: > Is it accurate then to say that Subversion may generate explicit > mergeinfo whenever it decides that there is something useful to record > about the set of revisions that contributed to a given node, and that > svn:mergeinfo properties may ap

issues after updating one client to version 1.8

2015-03-27 Thread Joan Baiges
Dear all, We are using svn 1.6 as a server, and most of my teammates are also using svn 1.6. I recently upgraded to 1.8 and after a merge operation from my 1.8 client several issues have arised: - My colleagues (svn client 1.6) are unable to merge branches getting errors of the type of: svn: El ser

unlocking a svn:needs-lock file

2015-03-27 Thread Andrew Schwartz
Hi, I'm using svn on Windows. If a file with the svn:needs-lock property is currently locked and is locally modified, I think that 'svn unlock' should fail. I'm seeing it happily succeed. After the 'svn unlock', the local checkout is in a bad state: it has local modifications to an unlocked svn