[ https://issues.apache.org/jira/browse/SVN-4859?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17145074#comment-17145074 ]
Julian Foad commented on SVN-4859: ---------------------------------- Setting the 'scheduled_for_deletion' flag does not seem to be a good solution, as it then stays set across multiple revision ranges in the merge, even if the paths get recreated in a later revision range. Removing the corresponding entries from 'children_with_mergeinfo' when a subtree is deleted is looking like the right solution. > Merge removing a folder with non-inheritable mergeinfo -> E155023: can't set > properties: invalid status for updating properties > ------------------------------------------------------------------------------------------------------------------------------- > > Key: SVN-4859 > URL: https://issues.apache.org/jira/browse/SVN-4859 > Project: Subversion > Issue Type: Bug > Affects Versions: 1.14.0, 1.10.6 > Reporter: Julian Foad > Assignee: Julian Foad > Priority: Major > Attachments: merge-rm-noninh-mi-test-1.patch > > > A merge failed with > svn: E155023: Can't set properties on '/.../folder': invalid status for > updating properties. > Reproduced in a test (attached) that merges the removal of a folder that had > non-inheritable mergeinfo. > The merge and its output look like: > {code:none} > svn merge -c5 ^/branch_A .../A > --- Merging r5 into '.../A': > D .../A/D > svn: E155023: Can't set properties on '/.../A/D/gamma': invalid status for > updating properties{code} > When a merge deletes a folder then surely it is a bug if it tries to update > properties inside that folder. -- This message was sent by Atlassian Jira (v8.3.4#803005)