[Svnmerge] [SPAM] Re: [PATCH] Handle transitive merging property conflicts for both merged/blocked revs

[Dustin J. Mitchell]

On Fri, Jul 06, 2007 at 07:40:35AM +0200, Giovanni Bajo wrote:
> On 06/07/2007 3.02, Raman Gupta wrote:
> > Attached is a patch to svnmerge.py that avoids property conflicts for
> > both merged revisions (as per my prior patch) as well as blocked
> > revisions. This patch obsoletes the one at http://tinyurl.com/3c229c.
> > 
> > The patch simply avoids conflicts be removing the integrated/blocked
> > properties altogether before calling merge, and then resets them to
> > their known values after the merge is complete.
> > 
> > Please use the earlier patch from Dustin (which was never committed)
> > to test this code. It can be found here:
> > 
> > http://tinyurl.com/39bwwj
> 
> This patch is OK together with the testcase. Please commit both.

Committed in revision 25683.

Dustin

-- 
        Dustin J. Mitchell
        Storage Software Engineer, Zmanda, Inc.
        http://www.zmanda.com/