[Svnmerge] [PATCH] Handle transitive merging propertyconflictsforbothmerged/blockedrevs

[Piet-Hein Peeters]

Raman Gupta <rocketraman at fastmail.fm> wrote on 08/07/2007 10:29:02 PM:

> Michael Willmott wrote:
> > Raman Gupta wrote:
> >> Does that test fail in your environment? It passes in mine:
> >
> > The test as written passes.  This patch exposes the bug and fails.
>
> Thank you Michael, that helped a lot. Please try out the attached
> patch in your environments and report your results. If everything
> works, then I will submit it for review and commit.
>
> Cheers,
> Raman Gupta
>

This new patch works fine! I'm glad we got this issue solved.

Regards,
Piet-Hein Peeters
Software Configuration Manager
----------------------------------------------------------------------------

Philips Medical Systems - Healthcare Informatics / PII
Room QV-136, P.O. Box 10.000, NL - 5680 DA Best
Phone +31 40 27 62016
----------------------------------------------------------------------------
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20070808/aac29734/attachment.html>