FreeTDS Development Group

["Castellano, Nicholas" <Nicholas_Castellano AT acml.com>]

No, it's not your fault.  Freddy and I recently replaced several files which
were formerly generated by autoconf, with files that now come from CVS.  CVS
won't nuke your copy and overwrite it with the new file from your repository
(I don't even think there is an option to tell CVS to do so) since it
doesn't want to be responsible for you losing the contents of the old file.
Once you erase the old file, CVS will extract a good copy from the
repository.

We probably should have explicitly mentioned it on the list when we did
this.  I guess we assumed everyone had seen this sort of thing before and
would know what to do about it.  Our bad.

Cheers,
--nick

-----Original Message-----
From: bounce-freetds-145195 AT franklin.oit.unc.edu
[mailto:bounce-freetds-145195 AT franklin.oit.unc.edu]
Sent: Tuesday, October 15, 2002 12:23 AM
To: TDS Development Group
Subject: [freetds] Re: atoll.c does not make


On Mon, 14 Oct 2002 23:27:48 -0400, "Castellano, Nicholas"
<Nicholas_Castellano AT acml.com> wrote:

> It appears that you got a conflict when you last updated from CVS, and
> you didn't resolve it properly.

You're probably right.  I've been lazy about learning the prune and delete
flags for updating.  Tomorrow I will try to be good.  

Thanks.

--jkl

---
You are currently subscribed to freetds as: [Nicholas_Castellano AT acml.com]
To unsubscribe, forward this message to
$subst('Email.Unsub')


The information contained in this transmission may contain privileged and
confidential information and is intended only for the use of the person(s)
named above.  If you are not the intended recipient, or an employee or agent
responsible for delivering this message to the intended recipient, any
review, dissemination, distribution or duplication of this communication is
strictly prohibited. If you are not the intended recipient, please contact
the sender immediately by reply e-mail and destroy all copies of the
original message. Please note that for certain accounts we do not accept
orders and/or instructions by e-mail, and for those accounts we will not be
responsible for carrying out such orders and/or instructions. Kindly refrain
from sending orders or instructions by e-mail unless you have confirmed that
we accept such communications for your account. Please also note that to
satisfy regulatory requirements we review the outgoing and incoming e-mail
correspondence of staff members serving certain functions.