Andy Singleton wrote on Mon, Jul 11, 2011 at 13:57:58 -0400: > Yes, the "cyclic merge" problem is a big one, and along with the > tree change problem, it accounts for most of the frustrating > behavior of Subversion merge - > http://subversion.tigris.org/issues/show_bug.cgi?id=2837 > > I believe that cyclic merges can be handled with a bigger > merge_history / merginfo file. When you do a merge, you make some > edits to resolve problems. Then, you commit the changes - all of > the merged changesets, plus the edits. You also write the > instructions
Define "instructions". If the algorithm is When trying to merge to branch T a patch rN from branch S, where rN added mergeinfo identifying changes that are already present on T, diff (the tree resulting from merging the mergeinfo-delta described by rN to S) to S@rN and apply the resulting patch to T, then perhaps you mean, precompute the parenthetical part at merge time and record it somewhere in the repository...? > for resolving this merge into the merge_history / > merginfo file. The next time you go to do a merge, you can replay > any of the changes that you need. The new merge_history will be a > big file with a complete history.
