[SVN-4862] Merge: the resulting mergeinfo is non-deterministic

• Type: Bug
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.14.0, 1.10.6
• Assignee: Unassigned
• Reporter: Julian Foad
• Created: 03/Jul/20 16:15
• Updated: 14/Feb/21 04:06
• Resolved: 23/Jul/20 09:19

Description

In a particular merge scenario (e.g. merge_tests.py 143, see SVN-4859), the merge result is non-deterministic: it produces slightly different results on different runs, at random.

The variations in output are (in that test):

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

vs.

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