From owner-freebsd-hackers Sun Mar 16 14:23:53 2003 Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6EADB37B401 for ; Sun, 16 Mar 2003 14:23:52 -0800 (PST) Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEAB543F85 for ; Sun, 16 Mar 2003 14:23:51 -0800 (PST) (envelope-from des@ofug.org) Received: by flood.ping.uio.no (Postfix, from userid 2602) id 2F6CB5308; Sun, 16 Mar 2003 23:23:48 +0100 (CET) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: Sean Chittenden Cc: Nate Williams , Sergey Babkin , hackers@FreeBSD.ORG Subject: Re: making CVS more convenient From: des@ofug.org (Dag-Erling =?iso-8859-1?q?Sm=F8rgrav?=) Date: Sun, 16 Mar 2003 23:23:48 +0100 In-Reply-To: <20030316221043.GL66903@perrin.int.nxad.com> (Sean Chittenden's message of "Sun, 16 Mar 2003 14:10:43 -0800") Message-ID: User-Agent: Gnus/5.090015 (Oort Gnus v0.15) Emacs/21.2 References: <3E73DCF7.80490FA6@bellatlantic.net> <15988.49648.483313.383942@emerger.yogotech.com> <3E74CC37.DF83EE46@bellatlantic.net> <15988.52765.777500.37926@emerger.yogotech.com> <20030316195807.GH66903@perrin.int.nxad.com> <20030316214841.GJ66903@perrin.int.nxad.com> <20030316221043.GL66903@perrin.int.nxad.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Sean Chittenden writes: > [local commit to file A ] > [different developer commits to file A on master repo] > [commit to file A on master repo] > [cvsup local repo with master repo] > > Wouldn't you have to delete A,v before A,v would continue to pick up > future changes? -sc No, cvsup would notice that the local file has the wrong size and re-fetch it (rather than just add the missing delta) so the local change would be replaced with the remote change. DES -- Dag-Erling Smorgrav - des@ofug.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message