I'm interested to know why this is needed. Is our merge tracking implementation so broken that it doesn't handle these types of things?
(Forgive me if I'm being naïve here.) -Hyrum On Apr 6, 2010, at 9:24 AM, [email protected] wrote: > Author: stsp > Date: Tue Apr 6 14:24:27 2010 > New Revision: 931164 > > URL: http://svn.apache.org/viewvc?rev=931164&view=rev > Log: > On the svn-patch-improvements branch, block r931162 from trunk to avoid > a cyclic merge the next time this branch is synced to trunk. > > Modified: > subversion/branches/svn-patch-improvements/ (props changed) > > Propchange: subversion/branches/svn-patch-improvements/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Tue Apr 6 14:24:27 2010 > @@ -33,4 +33,4 @@ > /subversion/branches/tc_url_rev:874351-874483 > /subversion/branches/tree-conflicts:868291-873154 > /subversion/branches/tree-conflicts-notify:873926-874008 > -/subversion/trunk:918519-930647 > +/subversion/trunk:918519-930647,931162 > >
