From owner-freebsd-bugs  Mon Jul  1 18:40:13 2002
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 51D9137B408
	for <freebsd-bugs@hub.freebsd.org>; Mon,  1 Jul 2002 18:40:02 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A19B243E2F
	for <freebsd-bugs@hub.freebsd.org>; Mon,  1 Jul 2002 18:40:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g621e1JU079879
	for <freebsd-bugs@freefall.freebsd.org>; Mon, 1 Jul 2002 18:40:01 -0700 (PDT)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g621e1sX079878;
	Mon, 1 Jul 2002 18:40:01 -0700 (PDT)
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EBA7137B405
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  1 Jul 2002 18:38:43 -0700 (PDT)
Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B15FD43E09
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  1 Jul 2002 18:38:43 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.4/8.12.4) with ESMTP id g621chOT086695
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 1 Jul 2002 18:38:43 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.4/8.12.4/Submit) id g621ch38086692;
	Mon, 1 Jul 2002 18:38:43 -0700 (PDT)
Message-Id: <200207020138.g621ch38086692@www.freebsd.org>
Date: Mon, 1 Jul 2002 18:38:43 -0700 (PDT)
From: Douglas Denault <doug@safeport.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: conf/40102: mergemaster should use the currend working directory as the default for -m
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-bugs.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-bugs>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-bugs>
X-Loop: FreeBSD.org


>Number:         40102
>Category:       conf
>Synopsis:       mergemaster should use the currend working directory as the default for -m
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 01 18:40:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Douglas Denault
>Release:        Stable 4.6
>Organization:
Safeport Network Services
>Environment:
FreeBSD pemaquid.safeport.com 4.6-RC FreeBSD 4.6-RC #0: Fri Jun 28 16:59:30 EDT 2002     doug@pemaquid.safeport.com:/usr/obj/usr/home/fbsd/stable/src/sys/PEMAQUID  i386
  
>Description:
It is very counter intuitive that mergemaster uses /usr/src rather than the current directory. As a subset of this bug and empty /usr/src seems to yield the correct result.    
>How-To-Repeat:
Use a source tree named anything except /usr/src
>Fix:
change   SOURCEDIR=${SOURCEDIR:-/usr/src/etc}  to

         SOURCEDIR=${SOURCEDIR:-`pwd`}

assuming that is the correct syntax
         
>Release-Note:
>Audit-Trail:
>Unformatted:

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