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

Re: Tree conflicts - see what happens in the current state

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 08 Oct 2008 17:21:01 +0100

On Wed, 2008-10-08 at 15:38 +0100, Julian Foad wrote:
> On Wed, 2008-10-08 at 14:47 +0100, Julian Foad wrote:
> > On Mon, 2008-10-06 at 13:43 +0200, Stephen Butler wrote:
> > > I think we don't need to check for tree conflicts in that function,
> > > because it's called from the add_file() callback. It calls its caller,
> > > so we end up checking for tree conflicts twice. Maybe I can unroll
> > > the recursion.
> >
> > That would be good.
>
> That's not only good but it was necessary to stop it checking twice in
> order to fix the above bug properly.
>
> Committed revision 33549.
>
> I am now unrolling the recursion because that was just confusing and
> unnecessary...

Committed revision 33554.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-08 18:21:20 CEST

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