RE: RE: Understanding Reflective/Cyclic Merges
From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-11-19 21:12:34 CET
>>svn merge ^/branches/sqlite-node-origins
>>Question: will merge tracking be smart enough to skip the revisions
>No it is not smart here. Assuming it is the first merge, it can potentially repeat merges the trunk changes to >mergeinfoless-copies branch. issue 2897 does not take care of it. *Probably we need to do diff-summarize >equivalent on the merge source to see if at all the source is a result of some merge by looking for >'svn:mergeinfo' changes and drive our merge accordingly.*.
Sorry I was wrong, close look at the code suggests that it can handle such indirect reflective merges. Though there could be a confusion here.
This is an archived mail posted to the Subversion Dev mailing list.