Merge problem

2014-09-09 Thread John Maher
Hello Just wondering if anyone may have an idea how my repository got so buggered up. I tried to merge a branch to the trunk and received 49 conflicts. 2 are files that do not need to be tracked so that leaves 47. Out of the 47 there are two problems, local add, incoming add upon merge & loc

Re: Change prevprops in pre-commit

2014-09-09 Thread Branko Čibej
Changing svnlook from its current read-only behaviour would be a bad idea, IMO. I vote for adding -t to svnadmin set/delrevprop, this matches svnlook's option, IIRC. -- Brane On 8 Sep 2014 15:27, "Philip Martin" wrote: > Sergey Azarkevich writes: > > > I see in pre-commit hook template that ch

Re: svn.crach.bmp

2014-09-09 Thread Andreas Stieger
Hello, > On 9 Sep 2014, at 08:12, "Tharindu WIJESURIYA [GENESIIS]" > wrote: > > > > Version: 1.6.12 (SlikSvn/1.6.12) Please use a current and maintained version of Apache Subversion for bug reports to be accepted. The current release is 1.8.10. Andreas

Re: http://svnbook.red-bean.com/ site

2014-09-09 Thread Peter Hitchman
Hi It is OK this morning. Regards Pete On 8 September 2014 17:06, Mark Phippard wrote: > I see this problem too. I use the Google DNS servers. > > Weird how there is a joker.com banner on the page as well. > > Mark > > > On Sep 8, 2014, at 11:57 AM, jbl...@icloud.com wrote: > > On Sep 8, 2014,

svn.crach.bmp

2014-09-09 Thread Tharindu WIJESURIYA [GENESIIS]
Hi I'm attachhing crach repot & minidump file. Pls. help.. Note :- Im getting this error only when merging via command line ONLY. merging via tortoise client is fine. Tharindu Process info: Cmd line: svn merge http://100.100.100.68:8181/svn/cfo/branches/cc/CC4072/ Version: 1.6.12 (SlikS