Re: svn --diff-cmd not working

2016-04-11 Thread loudking
Hi all, it turns out that the problem is because of End-of-Line in the wrapper script. Thank you for all your help. On Thursday, April 7, 2016 at 3:21:39 PM UTC+8, loudking wrote: > > Dear all, I configured svn to call a wrapper script for diff command but > encountered follow

svn --diff-cmd not working

2016-04-07 Thread loudking
Dear all, I configured svn to call a wrapper script for diff command but encountered following error: ~/knowsg.com/steps $ svn diff command_at_development.txt Index: command_at_development.txt === exec of '/home/knowsg_admin/bin/svnd

merge branch into trunk not satisfactory.

2015-05-27 Thread loudking
Hello all, I have checked out a working copy of repository trunk and aims to reintegrate a branch into trunk. trunk $ svn merge --reintegrate --accept=theirs-full svn://192.168.1.4/KnowSG.com/branches/branch1 --- Merging differences between repository URLs into '.': Usql/ChangeLog.txt Us