[jira] [Commented] (SVN-4859) Merge removing a folder with non-inheritable mergeinfo -> E155023: can't set properties: invalid status for updating properties

    [ https://issues.apache.org/jira/browse/SVN-4859?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17159262#comment-17159262 ] 

Julian Foad commented on SVN-4859:
----------------------------------

Committed r1879959: verify the merge result. This does not verify the exact mergeinfo that was set (which varies from one run to another due to SVN-4862) but does check that mergeinfo gets a 'modified' status on the expected paths.

> 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
>             Fix For: trunk
>
>         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)