Dipu H wrote on Thu, 28 Jun 2018 14:24 +0000:
> Looks like svn is not able to properly handle the svn:executable
> property changes via patch.
Works for me:
[[[
% svnadmin create r
% svn co -q file://`pwd`/r wc
% cd wc
% touch iota
% svn add -q iota
% svn ci -q -m add
% svn up -q
% svn ps -q svn:executable yes iota
% svn diff > foo
% svn revert -q iota
% svn patch -q foo
% svn diff
Index: iota
===================================================================
--- iota (revision 1)
+++ iota (working copy)
Property changes on: iota
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
]]]
You mentioned earlier that svn:executable was present with an empty
value. Is that really the case? If it is --- which would be surprising,
as it's supposed to be an impossible state --- it would explain why you
got a conflict.
Received on 2018-06-28 16:43:15 CEST