From owner-freebsd-hackers@FreeBSD.ORG  Mon Jan  4 20:04:48 2010
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
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 C02F31065676
	for <freebsd-hackers@freebsd.org>; Mon,  4 Jan 2010 20:04:48 +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 143918FC16
	for <freebsd-hackers@freebsd.org>; Mon,  4 Jan 2010 20:04:47 +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 13403310 for freebsd-hackers@freebsd.org;
	Tue, 05 Jan 2010 02:04:46 +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 o04K4jOQ082916
	for <freebsd-hackers@freebsd.org>; Tue, 5 Jan 2010 02:04:45 +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 o04K4ZsW082914
	for freebsd-hackers@freebsd.org; Tue, 5 Jan 2010 02:04:35 +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: Tue, 5 Jan 2010 02:04:35 +0600
From: Victor Sudakov <sudakov+freebsd@sibptus.tomsk.ru>
To: freebsd-hackers@freebsd.org
Message-ID: <20100104200434.GA82853@admin.sibptus.tomsk.ru>
References: <20091231033244.GA5631@admin.sibptus.tomsk.ru>
	<4B3CC72F.9030904@andric.com>
	<op.u5xkb1r91e62zd@merlin.emma.line.org>
	<4B408745.3030309@andric.com>
	<20100103154503.GA63734@admin.sibptus.tomsk.ru>
	<20100103221655.GA76049@server.vk2pj.dyndns.org>
	<20100104130315.GA79633@admin.sibptus.tomsk.ru>
	<20100104133657.GA47668@owl.midgard.homeip.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20100104133657.GA47668@owl.midgard.homeip.net>
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
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>, 
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jan 2010 20:04:48 -0000

Erik Trulsson 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.

AFAIK it was not available before RELENG_7_2.

-- 
Victor Sudakov,  VAS4-RIPE, VAS47-RIPN
sip:sudakov@sibptus.tomsk.ru