On Monday 30 July 2001 21:38, you wrote:
> It's also a bit unfortunate that Mark's patch isn't yet commited. Anyone
> volunteer for this? It's just too big for me.
I see in ViewCVS that everything looks OK, and I managed to 'cvs update' one
file as a test, but I can't 'cvs checkout' at the moment. Anyone else having
this problem?
Yeah, I'd like to get that patch in, too, before doing up this next release.
> Here's what I did with it:
> I applied the patch to the code before formatting it.
> It seems like it has been some changes in the repository after you created
> the patch. The following files was rejected:
>
> src/org/apache/fop/fo/flow/Block.java
> src/org/apache/fop/layout/AreaTree.java
> src/org/apache/fop/layout/Page.java
> src/org/apache/fop/tools/TestConverter.java
If I can figure out exactly what it is you did, and restore my 'cvs
checkout', I can take care of 3 of these. They were affected by marker
support, basically. Shouldn't conflict with Mark's changes, in a logical
sense, but 'patch' might not think so.
> The rest of the files made it. So, I applied codeformatting and license
> changing to those files and created a new patch which is attached to this
> mail. That patch consists of the following files:
>
[ List of files ]
OK, I'm not sure I understand 100%. The current CVS does _not_ reflect Mark's
patch at all, and you have a patch which applies a portion of Mark's patch,
to the _formatted_ codebase. Is that correct? And it is then a question of
applying the rest of the patch to Block, AreaTree, Page, and TestConverter,
right? Just trying to get my head straight. :-)
Regards,
Arved
P.S. Thanks for the yeoman effort.
--
Fairly Senior Software Type
e-plicity (http://www.e-plicity.com)
Halifax, Nova Scotia
Wireless * B2B * J2EE * XML
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]