[jira] [Created] (SVN-4862) Merge: the resulting mergeinfo is non-deterministic

"Julian Foad (Jira)" <[email protected]>
Newsgroups gmane.comp.version-control.subversion.issues
Message-ID <[email protected]>
Julian Foad created SVN-4862:
--------------------------------

             Summary: Merge: the resulting mergeinfo is non-deterministic
                 Key: SVN-4862
                 URL: https://issues.apache.org/jira/browse/SVN-4862
             Project: Subversion
          Issue Type: Bug
            Reporter: Julian Foad


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):
{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}



--
This message was sent by Atlassian Jira
(v8.3.4#803005)
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.