Index: ossp-pkg/svs/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/svs/ChangeLog,v
rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/svs/ChangeLog,v' 2>/dev/null
--- ChangeLog	2005/02/06 12:17:47	1.6
+++ ChangeLog	2005/08/18 07:46:14	1.7
@@ -8,6 +8,13 @@
 
   ChangeLog
 
+  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
+       *.orig and *.rej exists. Instead list it just as conflicting
+       as "cvs" does.
+       [Ralf S. Engelschall]
+
   Changes between 1.0.1 and 1.0.2 (13-Jan-2005 to 06-Feb-2005):
 
     *) Replace unportable "if ! <cmd>" construct.
Index: ossp-pkg/svs/svs.sh
RCS File: /v/ossp/cvs/ossp-pkg/svs/svs.sh,v
rcsdiff -q -kk '-r1.7' '-r1.8' -u '/v/ossp/cvs/ossp-pkg/svs/svs.sh,v' 2>/dev/null
--- svs.sh	2005/02/06 12:17:47	1.7
+++ svs.sh	2005/08/18 07:46:14	1.8
@@ -197,6 +197,10 @@
         for file in "$@"; do
             if [ -d $file ]; then
                 for f in `find $file -type f \( -name "*.orig" -or -name "*.rej" \) -print | sort`; do
+                    base=`echo "$f" | sed -e 's;\.orig$;;' -e 's;\.rej$;;'`
+                    if [ ".$f" = ".$base.orig" ] && [ -f $base.orig ] && [ -f $base.rej ]; then
+                        continue
+                    fi
                     files="$files $f"
                 done
             elif [ -f $file ]; then