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

Re: [PATCH] Fix issue #4049 - SEGV on patch that deletes and skips

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Wed, 09 Nov 2011 18:27:20 +0000

Stefan Sperling <stsp_at_elego.de> writes:

> On Wed, Nov 09, 2011 at 12:18:20PM +0000, Philip Martin wrote:
>> Daniel Näslund <dannas_at_dannas.name> writes:
>> > A side note; when I tested the patch I needed to use abspath's in the
>> > patch file or else the target wouldn't get skipped.
>> When raising the issue I had difficulty producing the test case because
>> I couldn't work out quite what caused a path to get skipped. I guess
>> Windows users might be generating patches with abspaths more than Unix
>> users.
> Patch targets get skipped in any of these circumstances:
> - the target filename is the empty string (this is just a sanity check)
> - the target is outside of the working copy being patched
> - the target is the working copy root
> - the target is unversioned, missing, ignored, or obstructed
> - the target is a locally deleted directory (this should be revisited
> now that wc-ng has been released)

I didn't really express myself clearly. Most of those don't set
target->skipped in init_patch_target as called by apply_one_patch and so
don't trigger the SEGV, they generally set target->skipped later in

uberSVN: Apache Subversion Made Easy
Received on 2011-11-09 19:27:55 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.