2004-11-19 Raja R Harinath <rharinath@novell.com>

* svnci (MSG): Prefix each ChangeLog segment with the directory it
	comes from.


svn path=/trunk/svn-tools/; revision=36307

ChangeLog

@@ -1,3 +1,8 @@
+2004-11-19  Raja R Harinath  <rharinath@novell.com>
+
+	* svnci (MSG): Prefix each ChangeLog segment with the directory it
+	comes from.
+
 2004-11-13  Ben Maurer  <bmaurer@ximian.com>
 
 	* mono-merge-oneoh: Hopefully I can stop dicking with the repo

svnci

@@ -1,4 +1,4 @@
-#!/bin/bash
+#! /bin/bash
 
 FILES=$@
 
@@ -6,7 +6,13 @@ echo "Creating commit message..."
 
 MSG=`mktemp`
 
-svn di $FILES | filterdiff -i*ChangeLog | grep '^[+]' | grep -v '^[+][+]' | sed s/^[+]// > $MSG
+svn di $FILES | filterdiff -i'*ChangeLog' | 
+  sed -e '/^[^+]/d' -e 's,^[+],,' -e '/^[^+]/b' -e 's,^[+][+],In,' -e 's,/ChangeLog.*$,:,' -e 's,ChangeLog.*$,.:,' >> $MSG
+
+case `grep '^In' $MSG | wc -l` in
+1) (echo 1d; echo w; echo q) | ed - $MSG ;;
+*) ;;
+esac
 
 cat $MSG
 
@@ -45,4 +51,4 @@ do
 			# try again
 		;;
 	esac
-done
+done