From owner-freebsd-hackers@FreeBSD.ORG Mon Jan 4 13:52:35 2010 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B30A7106568B for ; Mon, 4 Jan 2010 13:52:35 +0000 (UTC) (envelope-from erikt@midgard.homeip.net) Received: from ch-smtp02.sth.basefarm.net (ch-smtp02.sth.basefarm.net [80.76.149.213]) by mx1.freebsd.org (Postfix) with ESMTP id 6A5548FC15 for ; Mon, 4 Jan 2010 13:52:35 +0000 (UTC) Received: from c83-255-48-78.bredband.comhem.se ([83.255.48.78]:50048 helo=falcon.midgard.homeip.net) by ch-smtp02.sth.basefarm.net with esmtp (Exim 4.68) (envelope-from ) id 1NRn7E-0004XL-8e for freebsd-hackers@freebsd.org; Mon, 04 Jan 2010 14:37:02 +0100 Received: (qmail 61759 invoked from network); 4 Jan 2010 14:36:57 +0100 Received: from owl.midgard.homeip.net (10.1.5.7) by falcon.midgard.homeip.net with ESMTP; 4 Jan 2010 14:36:57 +0100 Received: (qmail 47715 invoked by uid 1001); 4 Jan 2010 14:36:57 +0100 Date: Mon, 4 Jan 2010 14:36:57 +0100 From: Erik Trulsson To: Victor Sudakov Message-ID: <20100104133657.GA47668@owl.midgard.homeip.net> References: <20091231033244.GA5631@admin.sibptus.tomsk.ru> <4B3CC72F.9030904@andric.com> <4B408745.3030309@andric.com> <20100103154503.GA63734@admin.sibptus.tomsk.ru> <20100103221655.GA76049@server.vk2pj.dyndns.org> <20100104130315.GA79633@admin.sibptus.tomsk.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100104130315.GA79633@admin.sibptus.tomsk.ru> User-Agent: Mutt/1.5.20 (2009-06-14) X-Originating-IP: 83.255.48.78 X-Scan-Result: No virus found in message 1NRn7E-0004XL-8e. X-Scan-Signature: ch-smtp02.sth.basefarm.net 1NRn7E-0004XL-8e dc17984d6154ec550ebd620979933ea7 Cc: freebsd-hackers@freebsd.org Subject: Re: "Checksum mismatch -- will transfer entire file" X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2010 13:52:35 -0000 On Mon, Jan 04, 2010 at 07:03:16PM +0600, Victor Sudakov wrote: > Peter Jeremy wrote: > > >I also see that many "changes" in the CVS seem to be useless: there > > >are no changes other than file version increments. > > > > SVN metadata changes will appear in CVS as version changes only. The > > most obvious/common case is branching - branching a native CVS repo > > just adds the branch tags. Branching a SVN repo replicates the tree > > and the SVN->CVS exporter turns the branch into a commit that touches > > each affected file. > > Thank you for the insight into theory, however the practical results > are annoying. For example, running mergemaster has become a nightmare. > It considers every file to be changed (unless you do some black magic > with DIFF_OPTIONS to ignore \$FreeBSD:.*\$). Or if you use mergemaster's -F flag which seems to exist for exactly this type of situation. > > BTW what does cvsup (in CVS mode) do with an RCS file to which only a > branch tag has been added? How does it mirror such a change? Just > curious. It will add the tag to the file of course. (In CVS tags are stored inside each RCS file.) -- Erik Trulsson ertr1013@student.uu.se