cvsmerge script

Henrik,
    I think that your cvsmerge script tries to replace files before they are
deleted? Anyway it fails badly on cygwin
====
# Prune out RCS keywords...
Can't do inplace edit on ./include/hash.h: Permission denied.
Can't do inplace edit on ./include/util.h: Permission denied.
Can't do inplace edit on ./lib/hash.c: Permission denied.
Can't do inplace edit on ./lib/Makefile.in: Permission denied.
Can't do inplace edit on ./lib/rfc1035.c: Permission denied.
Can't do inplace edit on ./src/access_log.c: Permission denied.
======

Those files are then missing when the message
===
WARNING: CONFLICTS!
Please correct the conflicts (see merge.log) and then exit from
this shell to have the changes committed
===
occurs.

I don't have time to fiddle with the script yet, this is just a heads-up for
you.

Rob
Received on Mon Nov 06 2000 - 04:54:33 MST