Date: Sun, 16 Mar 2003 14:29:58 -0800 From: Sean Chittenden <sean@chittenden.org> To: Dag-Erling Sm?rgrav <des@ofug.org> Cc: Nate Williams <nate@yogotech.com>, Sergey Babkin <babkin@bellatlantic.net>, hackers@FreeBSD.ORG Subject: Re: making CVS more convenient Message-ID: <20030316222958.GM66903@perrin.int.nxad.com> In-Reply-To: <xzp7kazq7bf.fsf@flood.ping.uio.no> 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> <xzpk7ezq92p.fsf@flood.ping.uio.no> <20030316214841.GJ66903@perrin.int.nxad.com> <xzpel57q8dj.fsf@flood.ping.uio.no> <20030316221043.GL66903@perrin.int.nxad.com> <xzp7kazq7bf.fsf@flood.ping.uio.no>
next in thread | previous in thread | raw e-mail | index | archive | help
> > [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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030316222958.GM66903>