From owner-freebsd-current  Wed Feb  6 10:20:52 2002
Delivered-To: freebsd-current@freebsd.org
Received: from smtpzilla2.xs4all.nl (smtpzilla2.xs4all.nl [194.109.127.138])
	by hub.freebsd.org (Postfix) with ESMTP id 7BF8237B421
	for <current@freebsd.org>; Wed,  6 Feb 2002 10:20:38 -0800 (PST)
Received: from router.hackerheaven.org (coolvibe.xs4all.nl [80.126.0.97])
	by smtpzilla2.xs4all.nl (8.12.0/8.12.0) with ESMTP id g16IKZJP061304
	for <current@freebsd.org>; Wed, 6 Feb 2002 19:20:37 +0100 (CET)
Received: from loki.ipv6.hackerheaven.org (loki.ipv6.hackerheaven.org [10.0.0.12])
	by router.hackerheaven.org (Postfix) with ESMTP id 181331C3F
	for <current@freebsd.org>; Wed,  6 Feb 2002 16:30:24 +0100 (CET)
Date: Wed, 6 Feb 2002 16:30:53 +0100
Mime-Version: 1.0 (Apple Message framework v480)
Content-Type: text/plain; charset=US-ASCII; format=flowed
Subject: Mergemaster niggle
From: Emiel Kollof <coolvibe@hackerheaven.org>
To: current@freebsd.org
Content-Transfer-Encoding: 7bit
Message-Id: <81B8D72A-1B16-11D6-A0EA-000A277C7FDE@hackerheaven.org>
X-Mailer: Apple Mail (2.480)
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-current.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-current>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-current>
X-Loop: FreeBSD.ORG

Take a look ath this diff:

--- /etc/nsmb.conf      Wed Jan 30 05:31:21 2002
+++ ./etc/nsmb.conf     Wed Feb  6 16:20:55 2002
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/nsmb.conf,v 1.4 2002/01/29 00:23:34 cjc Exp $
+# $FreeBSD: src/etc/nsmb.conf,v 1.3 2002/01/07 08:41:55 sheldonh Exp $
  #
  # smbfs lookups configuration files in next order:
  #      1. ~/.nsmbrc

[and then, the wise mergemaster asks...]

   Use 'd' to delete the temporary ./etc/nsmb.conf
   Use 'i' to install the temporary ./etc/nsmb.conf
   Use 'm' to merge the temporary and installed versions
   Use 'v' to view the diff results again

[urkkk... how many more to go?]

Diffs like there show up for COUNTLESS times in mergemaster. In fact, 
nothing changed except the cvs id. Why am I asked about these in 
mergemaster? Is there a way to ignore files that only have the cvsid 
changed? This would speed up the mergemaster run considerably...

Cheers,
Emiel


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