From owner-freebsd-current Mon Sep 7 07:40:48 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id HAA09407 for freebsd-current-outgoing; Mon, 7 Sep 1998 07:40:48 -0700 (PDT) (envelope-from owner-freebsd-current@FreeBSD.ORG) Received: from nomis.simon-shapiro.org (nomis.simon-shapiro.org [209.86.126.163]) by hub.freebsd.org (8.8.8/8.8.8) with SMTP id HAA09396 for ; Mon, 7 Sep 1998 07:40:36 -0700 (PDT) (envelope-from shimon@simon-shapiro.org) Received: (qmail 21036 invoked by uid 1000); 7 Sep 1998 15:44:01 -0000 Message-ID: X-Mailer: XFMail 1.3 [p0] on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 Date: Mon, 07 Sep 1998 11:44:01 -0400 (EDT) X-Face: (&r=uR0&yvh>h^ZL4"-TH61PD}/|Y'~58Z# Gz&BK'&uLAf:2wLb~L7YcWfau{;N(#LR2)\i.l8'ZqVhv~$rNx$]Om6Sv36S'\~5m/U'"i/L)&t$R0&?,)tm0l5xZ!\hZU^yMyCdt!KTcQ376cCkQ^Q_n.GH;Dd-q+ O51^+.K-1Kq?WsP9;cw-Ki+b.iY-5@3!YB5{I$h;E][Xlg*sPO61^5=:5k)JdGet,M|$"lq!1!j_>? $0Yc? Reply-To: shimon@simon-shapiro.org Organization: The Simon Shapiro Foundation From: Simon Shapiro To: FreeBSD-Current@FreeBSD.ORG Subject: New (?), damaging CVS behavior? Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Last CVS update was done here on Friday. Eventless. Today, CVS seems to delete files with conflicts! Elaboration: Up to (at leas) Friday, if cvs (cvs update -P -d) found a conflict in a file, it updated the file with >>>>> ===== <<<<<< markers to indicate area of conflict. Today, it simply deletes the old file and checks out a new version. (Yes, it leaves a .#... file, thank goodness. Is this an intended change? Simon To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message