Re: SVN patch issue with property changes

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_at_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_at_contrail-ubm-dipuh:/tmp/tests# svn diff xpathleak.py
> root_at_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
Received on 2018-06-29 19:59:52 CEST