Dipu H wrote on Thu, Jun 28, 2018 at 15:23:35 +0000: > It is a conflict. Values didn’t change after applying the patch. > > root@contrail-ubm-dipuh:/tmp/tests# svn patch /tmp/patch > C xpathleak.py > > rejected hunk ## -0,0 +1,1 ## (svn:executable) > Summary of conflicts: > Property conflicts: 1 > root@contrail-ubm-dipuh:/tmp/tests# svn diff xpathleak.py > root@contrail-ubm-dipuh:/tmp/tests#
You should probably find all files that have svn:executable set to empty and change the property's value to "*", and commit that. That will sidestep the issue with 'svn patch' modifying an empty property to non-empty that Julian has described elsethread. Cheers, Daniel
