From owner-cvs-src-old@FreeBSD.ORG  Tue Jan 26 18:24:37 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 4ACCD1065670
	for <cvs-src-old@freebsd.org>; Tue, 26 Jan 2010 18:24:37 +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 1FA2D8FC0A
	for <cvs-src-old@freebsd.org>; Tue, 26 Jan 2010 18:24:37 +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 o0QIObt9097151
	for <cvs-src-old@freebsd.org>; Tue, 26 Jan 2010 18:24:37 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0QIOa0i097150
	for cvs-src-old@freebsd.org; Tue, 26 Jan 2010 18:24:36 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <201001261824.o0QIOa0i097150@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:24:13 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
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:24:37 -0000

dougb       2010-01-26 18:24:13 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  SVN rev 203037 on 2010-01-26 18:24:13Z 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>
  
  Revision  Changes    Path
  1.72.2.3  +5 -5      src/usr.sbin/mergemaster/mergemaster.sh