Thanks Sean,
All three files are up to date now.
TTFN,
-bd-
On Nov 2, 2005, at 11:56 AM, Sean Schofield wrote:
Thanks. I have committed the changes (r330309). I did get one other
weird result which was that SVN was complaining that the following
*test* files were already in SVN:
InstrumentingPhaseListener
LifecycleImplCactus
TestConverter
I'm not sure what the problem is but someone familiar with these
changes (Bill?) should probably make sure that the changes from the
branch were merged down successfuly.
sean.
On 11/2/05, Martin Marinschek <[EMAIL PROTECTED]> wrote:
merged file.
regards,
Martin
On 11/2/05, Sean Schofield <[EMAIL PROTECTED]> wrote:
A couple of conflicts but not too bad considering the frantic
pace of
MyFaces development these days. Next time we branch please remember
to fix the problem once and only once in order to avoid this
problem.
There is one conflict that I don't feel comfortable resolving
(HtmlButtonRendererBase). Changes were made on the branch and the
trunk and I'm not familiar with either of them. It looks like
MBR may
have committed a patch (r320691) but that's about all I have to
go on.
It will be faster if the parties involved fix the conflict. Can
someone please resolved the conflicts in the attached file and
send it
back to the list? Once that is done I will commit everything
from the
merge.
Regards,
sean
--
http://www.irian.at
Your JSF powerhouse -
JSF Trainings in English and German
