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

Re: Segmentation fault in "svn resolve"

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 15 Jun 2016 10:26:59 +0200

On Wed, Jun 15, 2016 at 10:13:08AM +0200, Stefan wrote:
> This sounds utterly familiar to me:
> See this mail on the dev list: "[PATCH] error handling for
> build_text_conflict_resolve_items" from 02/01/16:
> http://mail-archives.apache.org/mod_mbox/subversion-dev/201602.mbox/%3C56AEA607.7030209%40posteo.de%3E
> The position you add the check seems to differ slightly (I added the
> mine_abspath check above the line which determines the conflict style,
> but I'd be +1 (non-binding) with any of the two patches.
> Regards,
> Stefan

Ah, I had missed that. Thanks!

Too bad this fell through the cracks back in February. Please try to
ping your own patches if you don't get a reply. We have a patch manager
role in the community who regularly pings every patch posted, but our
last patch manager has gone AWOL.

One problem with your version of this fix is that it creates a case
where we run code before a variable declaration in the same block.
We can't do that because we remain compatible with old compilers.
Received on 2016-06-15 10:27:10 CEST

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

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