[Svnmerge] Conflict on svnmerge-blocked property

[dustin at zmanda.com]

On Mon, Apr 23, 2007 at 03:35:23PM -0400, Raman Gupta wrote:
> The stopgap solution supports everything that svnmerge.py has every
> claimed to support. And it covers probably 90% of merge use cases. Its
> the old "don't let the perfect be the enemy of the good"...

This argument makes a lot of sense.  Also, most people won't be
upgrading to 1.5 immediately, so having a more capable svnmerge.py is
probably a good idea.

> If you still don't think the change is correct, ok. I for one am
> perfectly happy with my patched svnmerge and I am willing to wait for
> 1.5 for the correct solution :-)  If Dustin, or whoever, will create
> the test case, then I might update my patch to handle the blocked
> property conflict too.

Ah, I thought someone else had developed a test case.  I'll fix that up,
then.

Dustin

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