[Svnmerge] Conflict on svnmerge-blocked property

[Daniel Rall]

On Mon, 23 Apr 2007, dustin at zmanda.com wrote:

> 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?

Eventually, yes.  However, svnmerge.py works against a pre-1.5
repository, while core Subversion will require a 1.5 repository to
properly do its thing.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070425/43f96433/attachment-0002.pgp>