Author: ptw
Date: 2008-01-02 14:08:57 -0800 (Wed, 02 Jan 2008)
New Revision: 7704
Modified:
tools/trunk/svn/svn-bash.sh
Log:
Change 20080102-ptw-o by [EMAIL PROTECTED] on 2008-01-02 17:02:56 EST
in /Users/ptw/OpenLaszlo/tools
for http://svn.openlaszlo.org/tools
Summary: Tweak svn-review, svn-describe
Details:
Use --non-recursive for the svn-diff, since we are supplying an
explicit list of files. (e.g., svn-merge modifies properties on
'.', which then shows up in the files list and will cause svn diff
to recurse without this flag, listing all files in the changeset
twice (and files that are not in the changeset but are modified).
Tests:
IWFM
Modified: tools/trunk/svn/svn-bash.sh
===================================================================
--- tools/trunk/svn/svn-bash.sh 2008-01-02 21:24:45 UTC (rev 7703)
+++ tools/trunk/svn/svn-bash.sh 2008-01-02 22:08:57 UTC (rev 7704)
@@ -9,7 +9,7 @@
#
# author: benjamin shine / p t withington
# last modified: 2007-03-18 by ptw
-# Copyright 2006, 2007 Laszlo Systems, Inc.
+# Copyright 2006, 2007, 2008 Laszlo Systems, Inc.
export EDITOR=${EDITOR:-"vim"}
export SVNCHANGES=${SVNCHANGES:-$HOME/svnchanges}
@@ -100,7 +100,7 @@
# Create a script which will apply the patch
echo 'patch -bu -p0 <<"EOF"' > ${THEAPPLYSCRIPT}
# Create a patch which exactly describes the local changes to the files
- svn diff `sed -e '1,/^Files:/d' -e 's/^[A-Z +]\{6\} *//' < ${change}`
>> ${THEAPPLYSCRIPT}
+ svn diff --non-recursive `sed -e '1,/^Files:/d' -e 's/^[A-Z +]\{6\}
*//' < ${change}` >> ${THEAPPLYSCRIPT}
echo 'EOF' >> ${THEAPPLYSCRIPT}
# TODO: copy added files from the files.tar into the tree
# TODO: safely remove deleted files from the tree (how can this be
safe?)
@@ -193,7 +193,7 @@
echo
echo "Differences:"
echo
- svn diff --no-diff-deleted ${files}
+ svn diff --non-recursive --no-diff-deleted ${files}
else
echo "No change specified"
fi
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
