From owner-freebsd-hackers Sun Mar 16 14:30: 1 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 4767B37B404 for ; Sun, 16 Mar 2003 14:30:00 -0800 (PST) Received: from perrin.int.nxad.com (internal.ext.nxad.com [69.1.70.251]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC4DD43FBD for ; Sun, 16 Mar 2003 14:29:59 -0800 (PST) (envelope-from sean@perrin.int.nxad.com) Received: by perrin.int.nxad.com (Postfix, from userid 1001) id 468062105B; Sun, 16 Mar 2003 14:29:58 -0800 (PST) Date: Sun, 16 Mar 2003 14:29:58 -0800 From: Sean Chittenden To: Dag-Erling Sm?rgrav Cc: Nate Williams , Sergey Babkin , hackers@FreeBSD.ORG Subject: Re: making CVS more convenient Message-ID: <20030316222958.GM66903@perrin.int.nxad.com> 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 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4i X-PGP-Key: finger seanc@FreeBSD.org X-PGP-Fingerprint: 3849 3760 1AFE 7B17 11A0 83A6 DD99 E31F BC84 B341 X-Web-Homepage: http://sean.chittenden.org/ 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 > > [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. Right, which is what I was trying to suggest a fix for in the first place: the ability to prevent the loss of work committed to a local repository when using cvsup to sync repositories with the master repo. -sc -- Sean Chittenden To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message