[Svnmerge] Conflict on svnmerge-blocked property

[dustin at zmanda.com]

On Mon, Apr 23, 2007 at 04:57:30PM -0700, Daniel Rall wrote:
> Well, I'm not particularly happy about it.  I'd rather see someone fix
> svnmerge.py to DTRT, rather than use the proposed lossy handling.
> Given that no one is stepping up, the lossy handling seems like the
> lesser of two evils.  :-\

I'm "interested" in fixing svnmerge.py to DTRT, but (a) I probably don't
have time, (b) I need to finish my existing patch and get it submitted,
and (c) I'd hate to spend a lot of time on something that would become
irrelevant in 1.5.  Will the need for svnmerge go away?

Dustin

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