[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Assert in svn-1.7-alpha2 svn_client_merge3

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Fri, 15 Jul 2011 11:07:45 +0100

On Fri, 2011-07-15 at 10:46 +0100, Julian Foad wrote:
> On Thu, 2011-07-14, Barry Scott wrote:
> > On 14 Jul 2011, at 17:36, Julian Foad <julian.foad_at_wandisco.com> wrote:
> >
> > > On Thu, 2011-07-14 at 17:20 +0100, Julian Foad wrote:
> > >> On Tue, 2011-07-12, Barry Scott wrote:
> > >>> 1. Get http://pysvn.barrys-emacs.org/source_kits/pysvn-merge-assert.tar.bz2
> > >>> 2. tar xf pysvn-merge-assert.tar.bz2 -C /tmp
> > >>> 3. cd /tmp/pysvn-workspace/Sources
> > >>> 4. THe scripts assume that the SVN you wish to use is in /usr/local
> > >>> edit repo-merge-assert.sh and change the --svn-root-dir if that is not the case
> > >>> 5. ./repo-merge-assert.sh
> > >>
> > >> Thanks, Barry. Using your recipe I was able to reproduce the problem
> > >> and verify that my fix fixes it.
> > >
> > > Fix committed in r1146781. I wasn't persistent enough to create a
> > > regression test for this, but as the fix looks simple I'm happy now that
> > > I've confirmed it on your test.
> > >
> > great.
> >
> > I guess this makes the next alpha it?
>
> I've nominated it for 1.7.0 just now. By inspection it looks like it
> should be back-ported to 1.6.x too; I'll try to confirm that now and
> nominate it if so.

In 1.6.x, range_contains() does not assert that its inputs are valid
(non-empty) ranges, and it does the right thing with an empty range.
Therefore it works properly without this fix, so I won't nominate it for
1.6.x.

- Julian
Received on 2011-07-15 12:08:43 CEST

This is an archived mail posted to the Subversion Dev mailing list.