On Thu, Apr 07, 2005 at 01:51:49PM -0500, Steve Peters wrote: > Questions, comments, and complaints are all appreciated.
Applied as 24204. Your attempt to cause lots of reject hunks failed: > @@ -1947,7 +1947,7 @@ > SvPVX(sv) = pv; > SvCUR(sv) = cur; > SvLEN(sv) = len; > - SvIVX(sv) = iv; > + SvIV_set(sv, iv); > SvNVX(sv) = nv; > SvMAGIC(sv) = magic; > SvSTASH(sv) = stash; I synced back to before the NV_set changes, applied the patch, synced forward, and p4 resolve seemed to grasp how to merge things. Maybe I don't hate it. :-) Nicholas Clark
