[SVN-3056] avoid repeat merge in an intelligent way

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Duplicate
• Affects Version/s: ---
• Fix Version/s: 1.7-consider
• Component/s: libsvn_client
• Labels: merge-tracking
• Assignee: Unassigned
• Reporter: Subversion Importer
• Created: 20/Dec/07 14:19
• Updated: 27/Oct/18 16:36
• Resolved: 28/Oct/10 15:22

Description

Refer the problem described by Folker Schamel here,
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=133164

To summarize the detailed explanation above,
When we merge from /branch1 to trunk_wc(of /trunk) we see what has already been
merged from /branch1 and merge the rest of the revisions.
This approach is shallow as it fails to detect the common merges when source and
target received similar merge from same source in 2 different commits.

Consider the following scenario where this approach could fail.
merge rA from /branch1 to /branch2 and commit it in rB
merge rB from /branch1 to /trunk and commit it in rC
merge /branch2 to /trunk <---This merge should merge (rB ~ rA of /branch1)

This is the follow-up thread
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=133393

Original issue reported by kameshj

Issue Links

• duplicates: SVN-2837 Allow merge tracking to be useful when performing cyclic merging