|
Check-in Number:
|
5237 | |
| Date: |
2005-Oct-03 12:33:48 (local)
2005-Oct-03 10:33:48 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
- Try diff(3) with options -U3, -u, -C3 and none (in this order)
to be more platform neutral.
- Upgraded to GNU shtool 2.0.3 |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/svs/ChangeLog 1.7 -> 1.8
--- ChangeLog 2005/08/18 07:46:14 1.7
+++ ChangeLog 2005/10/03 10:33:48 1.8
@@ -8,6 +8,15 @@
ChangeLog
+ Changes between 1.0.3 and 1.0.4 (18-Aug-2005 to 29-Sep-2005):
+
+ *) Try diff(3) with options -U3, -u, -C3 and none (in this order)
+ to be more platform neutral.
+ [Ralf S. Engelschall]
+
+ *) Upgraded to GNU shtool 2.0.3
+ [Ralf S. Engelschall]
+
Changes between 1.0.2 and 1.0.3 (06-Feb-2005 to 18-Aug-2005):
*) Do not show a file as both modified and conflicting if both
|
|
ossp-pkg/svs/devtool.conf 1.2 -> 1.3
--- devtool.conf 2004/12/14 19:20:58 1.2
+++ devtool.conf 2005/10/03 10:33:48 1.3
@@ -4,7 +4,7 @@
%autogen
@autogen autoconf 2.59 "2.5*"
- @autogen shtool 2.0.1 "2.0.*" all
+ @autogen shtool 2.0.3 "2.0.*" all
%autoclean
@autoclean autoconf
@@ -42,5 +42,5 @@
%upload
echo "+++ copying to ftp://ftp.ossp.org/pkg/tool/svs/"
V=`./shtool version -ltxt -dshort VERSION`
- scp svs-${V}.tar.gz master.ossp.org:/e/ossp/ftp/pkg/tool/svs/
+ scp svs-${V}.tar.gz ossp@master.ossp.org:/v/ossp/ftp/pkg/tool/svs/
|
|
ossp-pkg/svs/svs.sh 1.8 -> 1.9
--- svs.sh 2005/08/18 07:46:14 1.8
+++ svs.sh 2005/10/03 10:33:48 1.9
@@ -117,18 +117,28 @@
if [ ! -f $edit ]; then
# special case: removed file
echo "Index: $edit"
- diff -u3 $orig /dev/null | sed -e "1s/^--- $orig/--- $edit/"
+ ( diff -U3 $orig /dev/null 2>/dev/null ||\
+ diff -u $orig /dev/null 2>/dev/null ||\
+ diff -C3 $orig /dev/null 2>/dev/null ||\
+ diff $orig /dev/null
+ ) | sed -e "1s/^--- $orig/--- $edit/"
elif [ ! -r $orig ] && [ ! -s $orig ]; then
# special case: new file
echo "Index: $edit"
- diff -u3 /dev/null $edit
+ diff -U3 /dev/null $edit 2>/dev/null ||\
+ diff -u /dev/null $edit 2>/dev/null ||\
+ diff -C3 /dev/null $edit 2>/dev/null ||\
+ diff /dev/null $edit
else
# regular case: edited file
if cmp $orig $edit >/dev/null 2>&1; then
:
else
echo "Index: $edit"
- diff -u3 $orig $edit
+ diff -U3 $orig $edit 2>/dev/null ||\
+ diff -u $orig $edit 2>/dev/null ||\
+ diff -C3 $orig $edit 2>/dev/null ||\
+ diff $orig $edit
fi
fi
done
|
|
