Proxy settings in SVN

2014-09-11 Thread Vaux, John
Hello all, It's my first time posting to this list and I am not subscribed so please CC me on any replies. I'm having difficulty with the proxy settings in Windows version of svn (I'm using the WANdisco compiled version). It seems as though no matter what I put

Re: Missing update-report close tag on CheckOut

2014-09-11 Thread Lloyd
I ran "svnadmin verify *repository_dir*" and it shows everything is ok ( "verified revision 312" and exits cleanly without any error). As the next step I have checked the event logs of visual svn server. It shows Cant open file D:\\Repositories\\myProj\\db\\revprops\\0\\28: access denied. [500, #

RE: Merge problem

2014-09-11 Thread John Maher
Thanks Stefan, I found the problem, it was me. First off I am the only developer here, so I suspected I did something. I also try to leave meaningful comments which helped out in this case. After reading the comments produced by the log command I remember seeing some files that subversion 'fo

Re: Merge problem

2014-09-11 Thread Stefan Sperling
On Thu, Sep 11, 2014 at 12:03:36PM +, Markus Schaber wrote: > Hi, John, > > I guess Stefans question for more details was directed to Andreas and his > rather unspecific rant, not to your email. Correct :)

Re: Merge problem

2014-09-11 Thread Stefan Sperling
On Thu, Sep 11, 2014 at 11:56:22AM +, John Maher wrote: > Thanks for your reply Stefan. There are no subdirs on either my trunk or > branches. The command I used was (from the working copy of (for example) > https://server/svn/erp/trunk) svn merge > https://server/svn/erp/branches/feature.

AW: Merge problem

2014-09-11 Thread Markus Schaber
Hi, John, I guess Stefans question for more details was directed to Andreas and his rather unspecific rant, not to your email. Best regards Markus Schaber CODESYS® a trademark of 3S-Smart Software Solutions GmbH Inspiring Automation Solutions 3S-Smart Software Solutions GmbH Dipl.-Inf. Marku

RE: Merge problem

2014-09-11 Thread John Maher
Thanks for your reply Stefan. There are no subdirs on either my trunk or branches. The command I used was (from the working copy of (for example) https://server/svn/erp/trunk) svn merge https://server/svn/erp/branches/feature. -Original Message- From: Stefan Sperling [mailto:s...@el

RE: Merge problem

2014-09-11 Thread John Maher
I sent lots of details. If you can't see them then perhaps something is buggy with the help system. The conflicts were either "local add, incoming add upon merge" or " local delete, incoming delete upon merge" -Original Message- From: Stefan Sperling [mailto:s...@elego.de] Sent: Wedne