# 
# 
# patch "ChangeLog"
#  from [8d331ae89d3c67913fd7561b8e8b3a4e32304a89]
#    to [2ad0b3f28fd9b642aa56a75a500b931989b8c787]
# 
# patch "contrib/ChangeLog.sh"
#  from [4d9ffe6a6251e11f483a5bd54ae8acc618676455]
#    to [d0256f1f67f1ce964b4be85a563a47a37769957d]
# 
============================================================
--- ChangeLog	8d331ae89d3c67913fd7561b8e8b3a4e32304a89
+++ ChangeLog	2ad0b3f28fd9b642aa56a75a500b931989b8c787
@@ -1,5 +1,10 @@
 2006-07-07  Timothy Brownawell  <address@hidden>
 
+	* contrib/ChangeLog.sh: Make it work from anywhere in a workspace,
+	not just the workspace root.
+
+2006-07-07  Timothy Brownawell  <address@hidden>
+
 	* tester.cc: Add a newline to the help message.
 	* tester.txt: Add a brief overview at the beginning.
 
============================================================
--- contrib/ChangeLog.sh	4d9ffe6a6251e11f483a5bd54ae8acc618676455
+++ contrib/ChangeLog.sh	d0256f1f67f1ce964b4be85a563a47a37769957d
@@ -20,16 +20,16 @@
 	shift
 done
 
-if ! [ -s _MTN/revision ]; then
-	if [ "x$REV" = "x" ] || [ "x$DB" = "x" ]; then
+if [ "x$REV" = "x" ]; then
+	REV=`mtn automate get_base_revision_id 2>/dev/null`
+fi
+
+if [ "x$REV" = "x" ] || [ "x$DB" = "x" ]; then
+	if ! mtn status >/dev/null 2>/dev/null; then
 		echo "Both the -d and -r arguments are needed when this" >&2;
-		echo "script is not run from the root of a monotone workspace." >&2;
+		echo "script is not run from inside a monotone workspace." >&2;
 		exit 1;
 	fi
-else
-	if [ "x$REV" = "x" ]; then
-		REV=`cat _MTN/revision`
-	fi
 fi
 
 # Get the contents of a cert