From owner-freebsd-current  Tue Mar 13  7:33:53 2001
Delivered-To: freebsd-current@freebsd.org
Received: from numeri.campus.luth.se (numeri.campus.luth.se [130.240.197.103])
	by hub.freebsd.org (Postfix) with ESMTP id 697FB37B727
	for <current@FreeBSD.ORG>; Tue, 13 Mar 2001 07:33:48 -0800 (PST)
	(envelope-from k@numeri.campus.luth.se)
Received: from numeri.campus.luth.se (localhost [127.0.0.1])
	by numeri.campus.luth.se (8.11.3/8.11.3) with ESMTP id f2DFY7306851;
	Tue, 13 Mar 2001 16:34:08 +0100 (CET)
	(envelope-from k@numeri.campus.luth.se)
Message-Id: <200103131534.f2DFY7306851@numeri.campus.luth.se>
X-Mailer: exmh version 2.1.1 10/15/1999
To: Martin Blapp <mb@imp.ch>
Cc: current@FreeBSD.ORG
Subject: Re: Proposal to mergemaster 
In-Reply-To: Your message of "Tue, 13 Mar 2001 13:41:47 +0100."
             <Pine.BSF.4.21.0103131202110.988-100000@levais.imp.ch> 
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Tue, 13 Mar 2001 16:34:07 +0100
From: Johan Karlsson <k@numeri.campus.luth.se>
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

At Tue, 13 Mar 2001 13:41:47 +0100, Martin Blapp wrote:
> 
> Hi,
> 
> After 100erts of mergemaster sessions, I'm looking for a way to improve
> mergemaster.
> 
> 1st thing, mergemaster displays per default all in changed files. That's
> ok for the first time, but if you maintain many hosts, this is annoying a
> lot.

I have made something like this and submitted a PR
http://www.freebsd.org/cgi/query-pr.cgi?pr=25771

It adds a new option to turn off the displaying of the diff result
but still give the user the possibilty to view the diff if he wants to.

Anyway have a look at the PR and tell me what you think.

Thanks
Johan K

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message