[Svnmerge] Conflict on svnmerge-blocked property

[Daniel Rall]

On Mon, 23 Apr 2007, Raman Gupta wrote:

> Daniel Rall wrote:
> > On Mon, 23 Apr 2007, dustin at zmanda.com wrote:
> > 
> >> On Mon, Apr 23, 2007 at 03:35:23PM -0400, Raman Gupta wrote:
> >>> The stopgap solution supports everything that svnmerge.py has ever
> >>> 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.
> > 
> > I'm fine with that.
> 
> You are? Then my previous patch that fixes the merge property
> conflict, and any updates to handle the blocking property conflict
> will be committed, subject to review of course? Or did that part of my
> proposal get lost in the quote trims?

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.  :-\

...
> > p.s. FYI, there are some known failing test case in svnmerge_test.py,
> > broken by a patch committed last year by Blair (r22788?).  I pointed
> > this out a while back, but the test cases don't seem to have been
> > updated yet.  I currently see 3 failures -- unsure if they're all a
> > result of that change.
> 
> Yes I saw that today. If someone could figure out which commit broke
> the test cases, we could probably fix them up pretty quick.

The commit changed the behavior of svnmerge.py -- the expectations of
svnmerge_test.py are no longer in line with that behavior.
-------------- 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/20070424/c135d966/attachment-0001.pgp>