[jira] [Comment Edited] (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=17151048#comment-17151048 ] 

Julian Foad edited comment on SVN-4859 at 7/3/20, 4:16 PM:
-----------------------------------------------------------

Attempting to update the test to verify the mergeinfo changes it makes, I find the merge result is non-deterministic: it produces slightly different results on different runs, at random. This happens both with and without the code changes, so was a pre-existing problem.

The variations in output are, for the second test (merge_tests.py 143):
{code:none}
--- Recording mergeinfo for merge of r3 through r7 into '.../A':
 U   .../A
--- Recording mergeinfo for merge of r3 through r7 into '.../A/D/G':
 G   .../A/D/G
--- Recording mergeinfo for merge of r3 through r7 into '.../A/D/G2':
 G   .../A/D/G2
 G   .../A/D

svn pg -R svn:mergeinfo A/
A      - /branch_A:3-7
A/D    - /branch_A/D:5-7     /branch_B/C:1*
A/D/G  - /branch_A/D/G:5-7   /branch_B/C/G:1*
A/D/G2 - /branch_A/D/G2:5-7  /branch_B/C/G2:1*
{code}
vs. 
{code:none}
--- Recording mergeinfo for merge of r3 through r7 into '.../A':
 U   .../A
--- Recording mergeinfo for merge of r3 through r7 into '.../A/D/G':
 U   .../A/D/G
--- Recording mergeinfo for merge of r3 through r7 into '.../A/D/G2':
 U   .../A/D/G2
 G   .../A/D

svn pg -R svn:mergeinfo A/
A      - /branch_A:3-7
A/D    - /branch_A/D:5-7     /branch_B/C:1*
A/D/G  - /branch_A/D/G:5-7   /branch_B/C/G:1*
A/D/G2 - /branch_A/D/G2:6-7  /branch_B/C/G2:1*

or

A      - /branch_A:3-7
A/D    - /branch_A/D:5-7     /branch_B/C:1*
A/D/G  - /branch_A/D/G:6-7   /branch_B/C/G:1*
A/D/G2 - /branch_A/D/G2:6-7  /branch_B/C/G2:1*
{code}
 Filed as SVN-4862 "Merge: the resulting mergeinfo is non-deterministic".


was (Author: julianfoad):
Attempting to update the test to verify the mergeinfo changes it makes, I find the merge result is non-deterministic: it produces slightly different results on different runs, at random. This happens both with and without the code changes, so was a pre-existing problem.

The variations in output are, for the second test (merge_tests.py 143):
{code:none}
--- Recording mergeinfo for merge of r3 through r7 into '.../A':
 U   .../A
--- Recording mergeinfo for merge of r3 through r7 into '.../A/D/G':
 G   .../A/D/G
--- Recording mergeinfo for merge of r3 through r7 into '.../A/D/G2':
 G   .../A/D/G2
 G   .../A/D

svn pg -R svn:mergeinfo A/
A      - /branch_A:3-7
A/D    - /branch_A/D:5-7     /branch_B/C:1*
A/D/G  - /branch_A/D/G:5-7   /branch_B/C/G:1*
A/D/G2 - /branch_A/D/G2:5-7  /branch_B/C/G2:1*
{code}
vs. 
{code:none}
--- Recording mergeinfo for merge of r3 through r7 into '.../A':
 U   .../A
--- Recording mergeinfo for merge of r3 through r7 into '.../A/D/G':
 U   .../A/D/G
--- Recording mergeinfo for merge of r3 through r7 into '.../A/D/G2':
 U   .../A/D/G2
 G   .../A/D

svn pg -R svn:mergeinfo A/
A      - /branch_A:3-7
A/D    - /branch_A/D:5-7     /branch_B/C:1*
A/D/G  - /branch_A/D/G:5-7   /branch_B/C/G:1*
A/D/G2 - /branch_A/D/G2:6-7  /branch_B/C/G2:1*

or

A      - /branch_A:3-7
A/D    - /branch_A/D:5-7     /branch_B/C:1*
A/D/G  - /branch_A/D/G:6-7   /branch_B/C/G:1*
A/D/G2 - /branch_A/D/G2:6-7  /branch_B/C/G2:1*
{code}
 

> 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)