From owner-svn-src-all@FreeBSD.ORG  Sat Dec 19 01:30:45 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B256C1065672;
	Sat, 19 Dec 2009 01:30:45 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A10AA8FC16;
	Sat, 19 Dec 2009 01:30:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBJ1UjJM014532;
	Sat, 19 Dec 2009 01:30:45 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBJ1UjSa014530;
	Sat, 19 Dec 2009 01:30:45 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200912190130.nBJ1UjSa014530@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 19 Dec 2009 01:30:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200700 - head/usr.sbin/mergemaster
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Dec 2009 01:30:45 -0000

Author: dougb
Date: Sat Dec 19 01:30:45 2009
New Revision: 200700
URL: http://svn.freebsd.org/changeset/base/200700

Log:
  In the places where find is used that the user may see the results,
  first pipe it to sort so that order of processing will be deterministic
  and like things will be grouped together.

Modified:
  head/usr.sbin/mergemaster/mergemaster.sh

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Fri Dec 18 22:24:19 2009	(r200699)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Sat Dec 19 01:30:45 2009	(r200700)
@@ -974,7 +974,7 @@ fi
 # change to something else in a newer version.  So we need to explicitly
 # test for this, and warn the user if what we find does not match.
 #
-for COMPFILE in `find .` ; do
+for COMPFILE in `find . | sort` ; do
   if [ -e "${DESTDIR}${COMPFILE#.}" ]; then
     INSTALLED_TYPE=`stat -f '%HT' ${DESTDIR}${COMPFILE#.}`
   else
@@ -1021,7 +1021,7 @@ for COMPFILE in `find .` ; do
   fi
 done
 
-for COMPFILE in `find . -type f`; do
+for COMPFILE in `find . -type f | sort`; do
 
   # First, check to see if the file exists in DESTDIR.  If not, the
   # diff_loop function knows how to handle it.
@@ -1124,7 +1124,7 @@ echo ''
 TEST_FOR_FILES=`find ${TEMPROOT} -type f -size +0 2>/dev/null`
 if [ -n "${TEST_FOR_FILES}" ]; then
   echo "*** Files that remain for you to merge by hand:"
-  find "${TEMPROOT}" -type f -size +0
+  find "${TEMPROOT}" -type f -size +0 | sort
   echo ''
 fi