[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 15:38:34 +0100

On Wed, 2008-10-08 at 14:47 +0100, Julian Foad wrote:
> On Mon, 2008-10-06 at 13:43 +0200, Stephen Butler wrote:
> > Quoting Julian Foad <julianfoad_at_btopenworld.com>:
> > > [*2] I just found a bug triggered by UC2 where, if you try to do the
> > > update from within the directory "uc2" itself, it throws an error
> > > because it doesn't like raising a tree conflict in a directory whose
> > > path is passed as the empty string "".
> >
> > This is because add_file_with_history() (update_editor.c:3314) calls
> > check_tree_conflict() with the parent path instead of the victim path.
>
> Thanks. Committed revision 33545.
>
> And the same call was passing an otherwise-unused log accumulator to
> store any conflict data in, where it should have been passing the
> existing parent directory's log accumulator. Fixing now...
>
> > 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...

- 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 16:38:53 CEST

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