Are there meant to be conflicts in this message?
On Tue, 18 Jan 2005, Norman Gray (GLA) wrote:
> Update of /cvs/thirdparty/fsf/m4
> In directory saturn:/tmp/cvs-serv15509
>
> Log Message:
> Import of m4 1.4.1
>
> Status:
>
> Vendor Tag: FSF
> Release Tags: m4-1-4-1
>
> U thirdparty/fsf/m4/acconfig.h
> U thirdparty/fsf/m4/aclocal.m4
> U thirdparty/fsf/m4/BACKLOG
> U thirdparty/fsf/m4/c-boxes.el
> U thirdparty/fsf/m4/ChangeLog
> C thirdparty/fsf/m4/config.h.in
> C thirdparty/fsf/m4/configure
> C thirdparty/fsf/m4/configure.in
> U thirdparty/fsf/m4/COPYING
> U thirdparty/fsf/m4/INSTALL
> U thirdparty/fsf/m4/install-sh
> U thirdparty/fsf/m4/Makefile.in
> U thirdparty/fsf/m4/mkinstalldirs
> U thirdparty/fsf/m4/NEWS
> U thirdparty/fsf/m4/README
> C thirdparty/fsf/m4/stamp-h.in
> U thirdparty/fsf/m4/THANKS
> U thirdparty/fsf/m4/TODO
> U thirdparty/fsf/m4/checks/01.define
> U thirdparty/fsf/m4/checks/02.arguments
> U thirdparty/fsf/m4/checks/03.arguments
> U thirdparty/fsf/m4/checks/04.arguments
> U thirdparty/fsf/m4/checks/05.arguments
> U thirdparty/fsf/m4/checks/06.pseudo_argu
> U thirdparty/fsf/m4/checks/07.pseudo_argu
> U thirdparty/fsf/m4/checks/08.pseudo_argu
> U thirdparty/fsf/m4/checks/09.pseudo_argu
> U thirdparty/fsf/m4/checks/10.pseudo_argu
> U thirdparty/fsf/m4/checks/11.undefine
> U thirdparty/fsf/m4/checks/12.defn
> U thirdparty/fsf/m4/checks/13.pushdef
> U thirdparty/fsf/m4/checks/14.pushdef
> U thirdparty/fsf/m4/checks/15.indir
> U thirdparty/fsf/m4/checks/16.ifdef
> U thirdparty/fsf/m4/checks/17.ifelse
> U thirdparty/fsf/m4/checks/18.ifelse
> U thirdparty/fsf/m4/checks/19.loops
> U thirdparty/fsf/m4/checks/20.loops
> U thirdparty/fsf/m4/checks/21.dumpdef
> U thirdparty/fsf/m4/checks/22.trace
> U thirdparty/fsf/m4/checks/23.dnl
> U thirdparty/fsf/m4/checks/24.changequote
> U thirdparty/fsf/m4/checks/25.changequote
> U thirdparty/fsf/m4/checks/26.changequote
> U thirdparty/fsf/m4/checks/27.changecom
> U thirdparty/fsf/m4/checks/28.changecom
> U thirdparty/fsf/m4/checks/29.m4wrap
> U thirdparty/fsf/m4/checks/30.include
> U thirdparty/fsf/m4/checks/31.include
> U thirdparty/fsf/m4/checks/32.include
> U thirdparty/fsf/m4/checks/33.divert
> U thirdparty/fsf/m4/checks/34.divert
> U thirdparty/fsf/m4/checks/35.undivert
> U thirdparty/fsf/m4/checks/36.undivert
> U thirdparty/fsf/m4/checks/37.undivert
> U thirdparty/fsf/m4/checks/38.divnum
> U thirdparty/fsf/m4/checks/39.cleardiv
> U thirdparty/fsf/m4/checks/40.cleardiv
> U thirdparty/fsf/m4/checks/41.len
> U thirdparty/fsf/m4/checks/42.index
> U thirdparty/fsf/m4/checks/43.regexp
> U thirdparty/fsf/m4/checks/44.regexp
> U thirdparty/fsf/m4/checks/45.substr
> U thirdparty/fsf/m4/checks/46.translit
> U thirdparty/fsf/m4/checks/47.patsubst
> U thirdparty/fsf/m4/checks/48.patsubst
> U thirdparty/fsf/m4/checks/49.format
> U thirdparty/fsf/m4/checks/foo
> U thirdparty/fsf/m4/checks/50.incr
> U thirdparty/fsf/m4/checks/51.eval
> U thirdparty/fsf/m4/checks/52.eval
> U thirdparty/fsf/m4/checks/53.esyscmd
> U thirdparty/fsf/m4/checks/54.sysval
> U thirdparty/fsf/m4/checks/55.errprint
> U thirdparty/fsf/m4/checks/56.errprint
> U thirdparty/fsf/m4/checks/57.m4exit
> U thirdparty/fsf/m4/checks/check-them
> U thirdparty/fsf/m4/checks/get-them
> U thirdparty/fsf/m4/checks/incl.m4
> U thirdparty/fsf/m4/checks/Makefile.in
> U thirdparty/fsf/m4/checks/stamp-checks
> U thirdparty/fsf/m4/doc/m4.info
> U thirdparty/fsf/m4/doc/m4.texinfo
> C thirdparty/fsf/m4/doc/Makefile.in
> U thirdparty/fsf/m4/doc/stamp-vti
> U thirdparty/fsf/m4/doc/texinfo.tex
> U thirdparty/fsf/m4/doc/version.texi
> U thirdparty/fsf/m4/examples/capitalize.m4
> U thirdparty/fsf/m4/examples/comments.m4
> U thirdparty/fsf/m4/examples/ddivert.m4
> U thirdparty/fsf/m4/examples/debug.m4
> U thirdparty/fsf/m4/examples/esyscmd.m4
> U thirdparty/fsf/m4/examples/exp.m4
> U thirdparty/fsf/m4/examples/file.m4
> U thirdparty/fsf/m4/examples/foreach.m4
> U thirdparty/fsf/m4/examples/forloop.m4
> U thirdparty/fsf/m4/examples/fstab.m4
> U thirdparty/fsf/m4/examples/hanoi.m4
> U thirdparty/fsf/m4/examples/incl-test.m4
> U thirdparty/fsf/m4/examples/include.m4
> U thirdparty/fsf/m4/examples/indir.m4
> U thirdparty/fsf/m4/examples/Makefile.in
> U thirdparty/fsf/m4/examples/misc.m4
> U thirdparty/fsf/m4/examples/multiquotes.m4
> U thirdparty/fsf/m4/examples/patsubst.m4
> U thirdparty/fsf/m4/examples/pushpop.m4
> U thirdparty/fsf/m4/examples/regexp.m4
> U thirdparty/fsf/m4/examples/reverse.m4
> U thirdparty/fsf/m4/examples/stackovf.sh
> U thirdparty/fsf/m4/examples/sync-lines.m4
> U thirdparty/fsf/m4/examples/sysv-args.m4
> U thirdparty/fsf/m4/examples/trace.m4
> U thirdparty/fsf/m4/examples/translit.m4
> U thirdparty/fsf/m4/examples/undivert.incl
> U thirdparty/fsf/m4/examples/undivert.m4
> U thirdparty/fsf/m4/examples/wrap.m4
> U thirdparty/fsf/m4/lib/alloca.c
> U thirdparty/fsf/m4/lib/COPYING.LIB
> U thirdparty/fsf/m4/lib/error.c
> U thirdparty/fsf/m4/lib/getopt.c
> U thirdparty/fsf/m4/lib/getopt.h
> U thirdparty/fsf/m4/lib/getopt1.c
> U thirdparty/fsf/m4/lib/Makefile.in
> U thirdparty/fsf/m4/lib/obstack.c
> U thirdparty/fsf/m4/lib/obstack.h
> U thirdparty/fsf/m4/lib/regex.c
> U thirdparty/fsf/m4/lib/regex.h
> U thirdparty/fsf/m4/lib/strtol.c
> U thirdparty/fsf/m4/lib/xmalloc.c
> U thirdparty/fsf/m4/lib/xstrdup.c
> U thirdparty/fsf/m4/src/ansi2knr.1
> U thirdparty/fsf/m4/src/ansi2knr.c
> U thirdparty/fsf/m4/src/builtin.c
> U thirdparty/fsf/m4/src/debug.c
> U thirdparty/fsf/m4/src/eval.c
> U thirdparty/fsf/m4/src/format.c
> U thirdparty/fsf/m4/src/freeze.c
> U thirdparty/fsf/m4/src/input.c
> U thirdparty/fsf/m4/src/m4.c
> U thirdparty/fsf/m4/src/m4.h
> U thirdparty/fsf/m4/src/macro.c
> U thirdparty/fsf/m4/src/Makefile.in
> U thirdparty/fsf/m4/src/output.c
> U thirdparty/fsf/m4/src/path.c
> U thirdparty/fsf/m4/src/stackovf.c
> U thirdparty/fsf/m4/src/symtab.c
>
> 5 conflicts created by this import.
> Use the following command to help the merge:
>
> cvs checkout -jFSF:yesterday -jFSF thirdparty/fsf/m4
>
--
Tim Jenness
JAC software
http://www.jach.hawaii.edu/~timj
|