Magesh - can you comment on how this might complicate the merge?

Its only tricky when the files have changed on HEAD too, right?  For the
bulk of the files, I doubt they've been touched since the Beta2 merge back
to HEAD.

    Erik


----- Original Message -----
From: "Conor MacNeill" <[EMAIL PROTECTED]>
To: "Ant Developers List" <[EMAIL PROTECTED]>
Sent: Tuesday, June 18, 2002 2:03 AM
Subject: Re: Javadoc cleanup for task reference generation


> Erik Hatcher wrote:
> > Steve and I will soon be committing a fair bit of Javadoc-only changes
to
> > the 1.5 branch to get the comments friendly for the proposal/xdocs
project
> > as we work on generating a complete task reference for our book.  I'm
> > assuming that no one will object to Javadoc changes, but if so please
speak
> > up.
> >
>
> Having just seen Steve's patch I did think of one issue. Such widespread
> changes may complicate the merge of the 1.5 branch back to MAIN.
>
> Conor
>
>
>
>
> --
> To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
>
>


--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to