From owner-freebsd-hackers@FreeBSD.ORG  Tue May  3 10:34:29 2005
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
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 2867F16A4CE
	for <hackers@freebsd.org>; Tue,  3 May 2005 10:34:29 +0000 (GMT)
Received: from volginfo.ru (ns.volginfo.ru [217.23.84.100])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BF28F43D64
	for <hackers@freebsd.org>; Tue,  3 May 2005 10:34:28 +0000 (GMT)
	(envelope-from den@FreeBSD.org)
Received: from volginfo.ru (localhost.volginfo.ru [127.0.0.1])
	by volginfo.ru (Postfix) with ESMTP
	id 574BF208B; Tue,  3 May 2005 14:34:49 +0400 (MSD)
Received: from [192.168.1.32] (llp-13.vistcom.ru [217.23.84.68])
	by volginfo.ru (Postfix) with ESMTP
	id 3E0CC208A; Tue,  3 May 2005 14:34:48 +0400 (MSD)
Message-ID: <4277538F.40204@FreeBSD.org>
Date: Tue, 03 May 2005 14:33:51 +0400
From: Denis Peplin <den@FreeBSD.org>
User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050331)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: John Hay <jhay@icomtek.csir.co.za>
References: <427743ED.6020200@FreeBSD.org>
	<20050503094438.GA44097@zibbi.icomtek.csir.co.za>
In-Reply-To: <20050503094438.GA44097@zibbi.icomtek.csir.co.za>
X-Enigmail-Version: 0.90.1.0
X-Enigmail-Supports: pgp-inline, pgp-mime
Content-Type: text/plain; charset=KOI8-R
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: ClamAV using ClamSMTP
cc: hackers@freebsd.org
Subject: Re: mergemaster improvement (auto-update for not modified files)
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 03 May 2005 10:34:29 -0000



John Hay wrote:
> On Tue, May 03, 2005 at 01:27:09PM +0400, Denis Peplin wrote:
>>There is one major problem here:
>>This can be done in single-user mode only if your
>>have local CVS repository, because if local CVS is
>>not exist, anoncvs is used.
>>
>>Possible solutions:
> 
> 
> What about mergemaster storing a copy of the original somewhere on disk
> for usage next time? Then the first run may still be slow, but following
> runs will be able to use it.

Every variant based on storing some files somewhere.

I'm just don't know wich variant is best (but it seems that
improving mergemaster -p is easiest way).