From bdeda2817becba3226064a436edc83a7d43a6139 Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 19 Dec 2009 01:30:45 +0000
Subject: [PATCH] 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.

---
 usr.sbin/mergemaster/mergemaster.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 7f7df5c5d12d..08fab3f81978 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -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