From owner-freebsd-hackers@FreeBSD.ORG Mon Jan 4 13:03:30 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 5CE7C1065698 for ; Mon, 4 Jan 2010 13:03:30 +0000 (UTC) (envelope-from sudakov+freebsd@sibptus.tomsk.ru) Received: from relay2.tomsk.ru (relay2.tomsk.ru [212.73.124.8]) by mx1.freebsd.org (Postfix) with ESMTP id B09C98FC0A for ; Mon, 4 Jan 2010 13:03:29 +0000 (UTC) X-Virus-Scanned: by clamd daemon 0.93.1 for FreeBSD at relay2.tomsk.ru Received: from admin.sibptus.tomsk.ru (account sudakov@sibptus.tomsk.ru [212.73.125.240] verified) by relay2.tomsk.ru (CommuniGate Pro SMTP 5.1.13) with ESMTPSA id 13403015 for freebsd-hackers@freebsd.org; Mon, 04 Jan 2010 19:03:27 +0600 Received: from admin.sibptus.tomsk.ru (sudakov@localhost [127.0.0.1]) by admin.sibptus.tomsk.ru (8.13.6/8.13.6) with ESMTP id o04D3QFb079879 for ; Mon, 4 Jan 2010 19:03:26 +0600 (OMST) (envelope-from sudakov+freebsd@sibptus.tomsk.ru) Received: (from sudakov@localhost) by admin.sibptus.tomsk.ru (8.13.6/8.13.6/Submit) id o04D3G7k079878 for freebsd-hackers@freebsd.org; Mon, 4 Jan 2010 19:03:16 +0600 (OMST) (envelope-from sudakov+freebsd@sibptus.tomsk.ru) X-Authentication-Warning: admin.sibptus.tomsk.ru: sudakov set sender to sudakov+freebsd@sibptus.tomsk.ru using -f Date: Mon, 4 Jan 2010 19:03:16 +0600 From: Victor Sudakov To: freebsd-hackers@freebsd.org Message-ID: <20100104130315.GA79633@admin.sibptus.tomsk.ru> 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> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100103221655.GA76049@server.vk2pj.dyndns.org> User-Agent: Mutt/1.4.2.3i Organization: AO "Svyaztransneft", SibPTUS X-PGP-Key: http://vas.tomsk.ru/vas.asc 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:03:30 -0000 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:.*\$). 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. -- Victor Sudakov, VAS4-RIPE, VAS47-RIPN sip:sudakov@sibptus.tomsk.ru