Paul Sandoz wrote:
> Hi Joe,
>
> Be careful to resolve conflicts when committing back files.
>
Oops, sorry. I did a "update -RAd" before checking in and did resolve
conflicts in a couple of source files. It was version 1.8 as shown in
the cvs email. But I must have accidentally removed that line when
editing. It happens from time to time the mouse pointer jumps and part
of file in editor gets highlighted when I use the toughpad. I should
have double-checked the cvs email. Sorry about that.
Joe
> You last commit of the build-without-nb.xml:
>
> @@ -101,7 +107,6 @@
> </fileset>
> <fileset dir="${basedir}">
> <include name="README-PACKAGE.txt"/>
> - <include name="XERCES-APACHE-1.1-license.txt"/>
> <include name="bin/*"/>
> <include name="lib/*.jar"/>
> <include name="${dist.dir}/${app.jar}"/>
>
>
> removed a line from the 1.8 version.
>
> I would be surprised if CVS let you commit this back by default
> without having to resolve a conflict. I suspect you were working from
> the 1.7 version.
>
> Paul.
>
>
> -------- Original Message --------
> Subject: CVS update: /fi/FastInfoset/
> Date: Thu, 19 May 2005 09:20:19 +0000
> From: sandoz_at_dev.java.net
> Reply-To: cvs_at_fi.dev.java.net
> To: cvs_at_fi.dev.java.net
>
> User: sandoz
> Date: 2005/05/19 02:20:19
>
> Log:
> Readding the line to include the XERCES license which was removed in the
> last commit.
>
> File Changes:
>
> Directory: /fi/FastInfoset/
> ===========================
>
> File [changed]: build-without-nb.xml
> Url:
> https://fi.dev.java.net/source/browse/fi/FastInfoset/build-without-nb.xml?r1=1.9&r2=1.10
>
> Delta lines: +1 -0
> -------------------
> --- build-without-nb.xml 18 May 2005 18:19:09 -0000 1.9
> +++ build-without-nb.xml 19 May 2005 09:20:17 -0000 1.10
> @@ -107,6 +107,7 @@
> </fileset>
> <fileset dir="${basedir}">
> <include name="README-PACKAGE.txt"/>
> + <include name="XERCES-APACHE-1.1-license.txt"/>
> <include name="bin/*"/>
> <include name="lib/*.jar"/>
> <include name="${dist.dir}/${app.jar}"/>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: cvs-unsubscribe_at_fi.dev.java.net
> For additional commands, e-mail: cvs-help_at_fi.dev.java.net
>
>