Date: Mon, 07 Sep 1998 11:44:01 -0400 (EDT) From: Simon Shapiro <shimon@simon-shapiro.org> To: FreeBSD-Current@FreeBSD.ORG Subject: New (?), damaging CVS behavior? Message-ID: <XFMail.980907114401.shimon@simon-shapiro.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?XFMail.980907114401.shimon>