|
From: | Derek Robert Price |
Subject: | Re: 1.11.6 Update broken |
Date: | Fri, 27 Jun 2003 16:28:46 -0400 |
User-agent: | Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.2) Gecko/20030208 Netscape/7.02 |
Larry Jones wrote:
Nick writes:I recently upgraded from 1.11.5 to 1.11.6 and noticed updates (via cvs update) completely overwrite my local copy w/ the latest revision in the repository when there's a conflict. This didn't happen in 1.11.5, is it normal for 1.11.6?No.
Unless the files were in binary mode (-kb). Then this has been normal CVS behavior for as long I can remember. Of course CVS should also have saved your modified version of the file to a backup file first and told you about it.
Derek -- *8^) Email: derek@ximbiot.com Get CVS support at <http://ximbiot.com>! --126. Always proof-read carefully to see if you any words out.
[Prev in Thread] | Current Thread | [Next in Thread] |