Webcore-bits: Height merge for RenderBox

Koos Vriezen koos.vriezen at xs4all.nl
Sat Oct 16 23:05:30 BST 2004


On Sat, Oct 16, 2004 at 11:54:30PM +0200, Stephan Kulow wrote:
> Am Samstag 16 Oktober 2004 23:06 schrieb Koos Vriezen:
> > On Sat, Oct 16, 2004 at 11:01:29PM +0200, Allan Sandfeld Jensen wrote:
> > > On Saturday 16 October 2004 22:52, Koos Vriezen wrote:
> > > > $ patch -p0 --dry-run < box-height.diff
> > > > patching file rendering/render_box.cpp
> > > > patching file rendering/render_box.h
> > > > Hunk #3 FAILED at 53.
> > > > Hunk #5 FAILED at 175.
> > > > 2 out of 5 hunks FAILED -- saving rejects to file
> > > > rendering/render_box.h.rej
> > > >
> > > > What version do you have?
> > >
> > > cvs HEAD
> >
> > Hmm, I have that too:
> 
> I have the same rejects. But they are only white space rejections. So I guess
> the diff was done with -b. No problem whatsoever.

Ah, and I wondered if my parallel universe went out of sync (just
checking if my insurance would cover an anti-matter blow), but it's only
whitespace, ppfffeeww :-)

Doesn't fix map24 btw.

Koos




More information about the kfm-devel mailing list