From nobody@FreeBSD.org  Mon Jul  1 18:38:43 2002
Return-Path: <nobody@FreeBSD.org>
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
Subject: mergemaster should use the currend working directory as the default for -m
X-Send-Pr-Version: www-1.0

>Number:         40102
>Category:       conf
>Synopsis:       mergemaster should use the currend working directory as the default for -m
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 01 18:40:01 PDT 2002
>Closed-Date:    Mon Jul 01 19:09:22 PDT 2002
>Last-Modified:  Mon Jul 01 19:09:22 PDT 2002
>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:
State-Changed-From-To: open->closed 
State-Changed-By: dougb 
State-Changed-When: Mon Jul 1 19:04:58 PDT 2002 
State-Changed-Why:  

Your definition of "counter-intuitive" seems a bit self-serving. 
Given that the vast majority of users have their source trees 
in /usr/src, and given that mm has never required you to be in 
/usr/src to work, it's not reasonable to assume that all of those 
people should change their habits to suit your convenience. 

In other words, to change the default at this time would be a 
giant POLA violation, and the -m option already exists to handle 
exactly the case you cite. 


Responsible-Changed-From-To: freebsd-bugs->dougb 
Responsible-Changed-By: dougb 
Responsible-Changed-When: Mon Jul 1 19:04:58 PDT 2002 
Responsible-Changed-Why:  

mergemaster is my baby. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=40102 
>Unformatted:
