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

Re: tree-conflicts: dirs_same_p()

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 25 Sep 2008 23:24:40 +0100

On Fri, 2008-09-26 at 00:17 +0200, Neels J. Hofmeyr wrote:
> Duh, target needs to be "".

Thanks Neels. I had your email open here, starting to look at it but
haven't wrapped my head around it.

Sorry I couldn't remember in what state I'd left it.

- Julian

> Neels J. Hofmeyr wrote:
> > Hey Julian,
> >
> > I'm investigating your preliminary patch for directory comparison (I've
> > attached the patch for dev@'s reference). Here's what I found:
> >
> >
> > In merge_tests.py 122
> > First merge operation
> > In dirs_same_p()
> > dirs_same_file_delete() reports a difference, where it shouldn't.
> >
> >
> > A backtrace reveals some sort of pointer fault in the PATH argument:
> >
> > #0 dirs_same_file_deleted (adm_access=0x0, state=0x0,
> > path=0x82c5340 "A/B2/X�\036\b�!*\b �'\b\\�\036\b/lambda",
> > [...]
> >
> >
> > To cut a long trace short, the erratic path element is introduced because
> > const char *TARGET is used uninitialized in dirs_same_p(). That any of it
> > ever worked is close to a miracle ;)
> >
> > Am I right to assume TARGET should be replaced by the dirs_same_p()'s MINE
> > parameter? ...No, I'm not, now it says:
> >
> > svn: In file 'subversion/libsvn_ra/ra_loader.c' line 989: assertion failed
> > (svn_path_is_empty(diff_target) ||
> > svn_path_is_single_path_component(diff_target))
> >
> >
> > Hm, do you have an answer ready? Otherwise I'll try and wrap my brain around
> > this tomorrow...
> >
> > ~Neels
> >
> >
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-26 00:25:04 CEST

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