Hi Daniel,

Thanks for the update. Yes, I have many files in the repository with 
"svn:executable" value set to "null". This is a very old repository, may be 
created using a very older version of svn. Older clients might have added the 
property without a value.

root@contrail-ubm-dipuh:/tmp/tests# svn pl xpathleak.py
Properties on 'xpathleak.py':
  svn:executable
root@contrail-ubm-dipuh:/tmp/tests# svn pg svn:executable xpathleak.py

root@contrail-ubm-dipuh:/tmp/tests#

Thanks,
Dipu H


On 6/28/18, 8:13 PM, "Daniel Shahaf" <d...@daniel.shahaf.name> wrote:

    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.
    

Reply via email to