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

Re: Error in abs-path handling in normalize_merge_sources()

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Sat, 05 Dec 2009 00:42:01 +0000

On Fri, 2009-12-04 at 18:33 +0000, Julian Foad wrote:
> Thanks. I have to run away right now, so if nobody beats me to it I'll
> read this on Monday.

Or late tonight, in fact.

It's a good patch. Committed revision 887469.

Thank you, Kannan.

I think that fixed the last of the URLs being passed to
svn_dirent_get_absolute(), so we can now assert that its input is not a
URL.

- Julian

> > Julian Foad wrote:
> > [..]
> > > I think that means there are two more places where this mistake is made:
> > > in 'log.c' and in 'mergeinfo.c'. Would you be willing to fix those, too?
> >
> > Fix requires only in log.c Attaching the patch herewith.
> >
> > [[[
> > Log:
> > Fix some more instances of calling svn_dirent_get_absolute() on a URL,
> > following up on [1].
> >
> > * subversion/libsvn_client/log.c
> > (svn_client_log5): Check the type of the path and invoke
> > `svn_dirent_get_absolute()' only if it is a WC path. Rename the
> > variable `local_abspath' to `local_abspath_or_url' as it holds either
> > a WC abs-path or a URL.
> >
> > Patch by: Kannan R <kannanr_at_collab.net>
> >
> > [1]-http://svn.apache.org/viewvc?rev=887187&view=rev
> > ]]]
> >
> > - --
> > Thanks & Regards,
> > Kannan
> > -----BEGIN PGP SIGNATURE-----
> > Version: GnuPG v1.4.6 (GNU/Linux)
> > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
> >
> > iQEVAwUBSxlRTXlTqcY7ytmIAQLUBwf+KsNWnrWfDo4bo/9kotd67kP3pmPe4wz6
> > IV3AP2ICd69XyR/Bw6xS5PmLwZUaajJewkHM81UDyCWxqaACTifXC6StKVeHM5Gb
> > QZmgvIm0cuHODKheTYI/7max3LMr6QD2QdL+tsxjYXntvF+vGcNaPaCGfbLZH/CS
> > vlbxBCmrbOIP4kpRz21q2dt3VNEl33TmbbNFJXIPUuk3Dx0wHo/qgSefKdXhpeZT
> > TQiDlXv7lblXf4Bt/EECPXQkrgKBxyeya1Tbj1vHYj89JAMGXL7jWSSwtoaYFkLv
> > DsEU49gN4QERfSnPdspnUazlEpWG2ArGcyRchn5t+VELPLxNzU8Mmg==
> > =qIH2
> > -----END PGP SIGNATURE-----
>
>
Received on 2009-12-05 01:42:38 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.