From owner-freebsd-bugs Wed Jul 3 14:17:54 2002 Delivered-To: freebsd-bugs@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B48237B400 for ; Wed, 3 Jul 2002 14:17:53 -0700 (PDT) Received: from mail-relay1.yahoo.com (mail-relay1.yahoo.com [216.145.48.34]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D9A043E09 for ; Wed, 3 Jul 2002 14:17:53 -0700 (PDT) (envelope-from DougB@FreeBSD.org) Received: from FreeBSD.org (12-234-90-219.client.attbi.com [12.234.90.219]) by mail-relay1.yahoo.com (Postfix) with ESMTP id C5DB98B5DA; Wed, 3 Jul 2002 14:17:52 -0700 (PDT) Message-ID: <3D236A00.12A34A70@FreeBSD.org> Date: Wed, 03 Jul 2002 14:17:52 -0700 From: Doug Barton Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.79 [en] (X11; U; FreeBSD 4.6-RELEASE i386) X-Accept-Language: en MIME-Version: 1.0 To: doug@safeport.com Cc: freebsd-bugs@FreeBSD.org Subject: Re: conf/40102: mergemaster should use the currend working directoryasthe default for -m References: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org You haven't answered the one thing I actually asked you. Do you have an /etc/mergemaster.rc file, and/or ~/.mergemasterrc, and if so, what are the contents. Also, please do 'type mergemaster' and make sure the one you're using is in /usr/sbin, and then do 'diff -u /usr/sbin/mergemaster /usr/src/usr.sbin/mergemaseter.sh' (or wherever your source tree is) and let me know if you see anything different. The description that you are providing of what's happening on your systems leads me strongly to believe that something is very non-standard at your site. Doug To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message