ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Peter Reilly" <peter.kitt.rei...@gmail.com>
Subject Re: svn commit: r557907 - /ant/core/trunk/docs/manual/install.html
Date Fri, 20 Jul 2007 13:22:09 GMT
I know that there is an easy way (using svn merge), but
I do not know how to make it work.

I normally merge by hand.

(using diff -Naur)
for example
cd $ANT_17_BRANCH/src/manual
diff -Naur install.html ../../../ant-trunk/docs/manual > i.patch
patch < i.patch
svn diff install.html
svn commit -m"merge from HEAD" install.html

Peter



On 7/20/07, Jan.Materne@rzf.fin-nrw.de <Jan.Materne@rzf.fin-nrw.de> wrote:
> Is there an easy way for this?
>
> Jan
>
> >-----Urspr√ľngliche Nachricht-----
> >Von: Peter Reilly [mailto:peter.kitt.reilly@gmail.com]
> >Gesendet: Freitag, 20. Juli 2007 13:50
> >An: Ant Developers List
> >Betreff: Re: svn commit: r557907 -
> >/ant/core/trunk/docs/manual/install.html
> >
> >Hi,
> >Do not forget that these changes need to be
> >merged into the ANT_17_BRANCH if you what them in for
> >ant 1.7.1.
> >
> >Peter
> >
> >On 7/20/07, jhm@apache.org <jhm@apache.org> wrote:
> >> Author: jhm
> >> Date: Fri Jul 20 00:37:49 2007
> >> New Revision: 557907
> >>
> >> URL: http://svn.apache.org/viewvc?view=rev&rev=557907
> >> Log:
> >> We always encourage not to have a CLASSPATH set.
> >>
> >> Modified:
> >>     ant/core/trunk/docs/manual/install.html
> >>
> >> Modified: ant/core/trunk/docs/manual/install.html
> >> URL:
> >http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/install
> >.html?view=diff&rev=557907&r1=557906&r2=557907
> >>
> >===============================================================
> >===============
> >> --- ant/core/trunk/docs/manual/install.html (original)
> >> +++ ant/core/trunk/docs/manual/install.html Fri Jul 20 00:37:49 2007
> >> @@ -221,9 +221,10 @@
> >>    <td width="5%">&nbsp;</td>
> >>    <td>
> >>      The ant.bat script makes use of three environment variables -
> >> -    ANT_HOME, CLASSPATH and JAVA_HOME. <b>Ensure</b> that if
> >> -    these variables are set, they do <b><u>not</u></b>
have
> >quotes (either
> >> -    ' or &quot;) and they do <b><u>not</u></b>
end with \ or with /.
> >> +    ANT_HOME, CLASSPATH and JAVA_HOME. <b>Ensure</b> that
> >ANT_HOME and JAVA_HOME variables are set,
> >> +    and that they do <b><u>not</u></b> have quotes
(either
> >> +    ' or &quot;) and they do <b><u>not</u></b>
end with \
> >or with /. CLASSPATH should be unset or
> >> +    empty.
> >>    </td>
> >>  </tr>
> >>  </table>
> >>
> >>
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> >> For additional commands, e-mail: dev-help@ant.apache.org
> >>
> >>
> >
> >---------------------------------------------------------------------
> >To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> >For additional commands, e-mail: dev-help@ant.apache.org
> >
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> For additional commands, e-mail: dev-help@ant.apache.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message