From owner-cvs-src-old@FreeBSD.ORG  Tue Jan 26 18:25:42 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BADD7106568F
	for <cvs-src-old@freebsd.org>; Tue, 26 Jan 2010 18:25:42 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F7908FC23
	for <cvs-src-old@freebsd.org>; Tue, 26 Jan 2010 18:25:42 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0QIPg8i097300
	for <cvs-src-old@freebsd.org>; Tue, 26 Jan 2010 18:25:42 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0QIPgpF097299
	for cvs-src-old@freebsd.org; Tue, 26 Jan 2010 18:25:42 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <201001261825.o0QIPgpF097299@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	dougb@repoman.freebsd.org using -f
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 26 Jan 2010 18:25:22 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jan 2010 18:25:42 -0000

dougb       2010-01-26 18:25:22 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  SVN rev 203038 on 2010-01-26 18:25:22Z by dougb
  
  MFC r202817:
  
  Make -U once again honor -D after my change to consolidate setting
  of MTREEDB with DESTDIR.
  
  PR:             bin/143089
  Submitted by:   Anton Yuzhaninov <citrin@citrin.ru>
  
  Approved by:    re (kensmith)
  
  Revision  Changes    Path
  1.54.2.8  +5 -5      src/usr.sbin/mergemaster/mergemaster.sh