merge branch into trunk not satisfactory.
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 Usql/Makefile C html C perl/download_log.sh Uperl/export_monitor.pl Uperl/common.pm Uperl/ChangeLog.txt C perl/upload_source_code.sh C perl/new_version.pl C public_html Uconfig/subversion C config/development Uconfig/svndiffwrap.sh Uconfig/ChangeLog.txt Uconfig/production/hosts Uconfig/production/dovecot.conf C config/production/ssl.key C config/production/network C config/production/main.cf C config/production/sub.class1.server.ca.pem C config/production/ca.pem Udoc/work_flow.txt Udoc/infra.txt C Makefile C steps/command_at_development.txt G . Summary of conflicts: Tree conflicts: 13 trunk $ svn resolve --accept working html perl/download_log.sh perl/upload_source_code.sh perl/new_version.pl public_html config/development config/production/ca.pem config/production/sub.class1.server.ca.pem config/production/ssl.key config/production/network config/production/main.cf Makefile steps/command_at_development.txt Resolved conflicted state of 'html' Resolved conflicted state of 'perl/download_log.sh' Resolved conflicted state of 'perl/upload_source_code.sh' Resolved conflicted state of 'perl/new_version.pl' Resolved conflicted state of 'public_html' Resolved conflicted state of 'config/development' Resolved conflicted state of 'config/production/ca.pem' Resolved conflicted state of 'config/production/sub.class1.server.ca.pem' Resolved conflicted state of 'config/production/ssl.key' Resolved conflicted state of 'config/production/network' Resolved conflicted state of 'config/production/main.cf' Resolved conflicted state of 'Makefile' Resolved conflicted state of 'steps/command_at_development.txt' trunk $ svn commit -m 'dont know what local modifications are 2' trunk $ svn update At revision 345. But when I do a svn diff I could still see the difference between branch and trunk. Can anybody tell me what to do please? trunk $ svn diff svn://192.168.1.4/KnowSG.com/branches/branch1 svn://192.168.1.4/KnowSG.com/trunk Index: public_html/sample.php === 2 files to edit Index: public_html/style.css === 2 files to edit Index: public_html/images/bg_container.png === Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: public_html/en.lang.php === 2 files to edit Index: public_html/zh.lang.php === 2 files to edit Index: public_html/ChangeLog.txt === 2 files to edit Index: steps/command_at_development.txt === 2 files to edit Property changes on: . ___ Added: svn:mergeinfo Merged /KnowSG.com/branches/branch1:r308-344
svn --diff-cmd not working
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/svndiffwrap.sh' failed: No such file or directorysvn: '/home/knowsg_admin/bin/svndiffwrap.sh' returned 255 part of ~/.subversion/config is like this: ### Set diff-cmd to the absolute path of your 'diff' program. ### This will override the compile-time default, which is to use ### Subversion's internal diff implementation. # diff-cmd = diff_program (diff, gdiff, etc.) diff-cmd = /home/knowsg_admin/bin/svndiffwrap.sh But the script is right there with executing privileges: ~/knowsg.com/steps $ ll /home/knowsg_admin/bin total 4.0K -rwxr-xr-x 1 knowsg_admin knowsg_admin 369 Apr 5 11:06 svndiffwrap.sh* Even its parent directory is on $PATH: ~/knowsg.com/steps $ echo $PATH /usr/lib/qt-3.3/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin: /sbin:/home/knowsg_admin/bin Can anybody help me with this please? Thanks.
Re: svn --diff-cmd not working
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 following error: > > ~/knowsg.com/steps $ svn diff command_at_development.txt > Index: command_at_development.txt > === > exec of '/home/knowsg_admin/bin/svndiffwrap.sh' failed: No such file or > directorysvn: '/home/knowsg_admin/bin/svndiffwrap.sh' returned 255 > > > part of ~/.subversion/config is like this: > > ### Set diff-cmd to the absolute path of your 'diff' program. > ### This will override the compile-time default, which is to use > ### Subversion's internal diff implementation. > # diff-cmd = diff_program (diff, gdiff, etc.) > diff-cmd = /home/knowsg_admin/bin/svndiffwrap.sh > > > But the script is right there with executing privileges: > > ~/knowsg.com/steps $ ll /home/knowsg_admin/bin > total 4.0K > -rwxr-xr-x 1 knowsg_admin knowsg_admin 369 Apr 5 11:06 svndiffwrap.sh* > > > Even its parent directory is on $PATH: > ~/knowsg.com/steps $ echo $PATH > /usr/lib/qt-3.3/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin > :/sbin:/home/knowsg_admin/bin > > > Can anybody help me with this please? Thanks. >
