[Cvs-cvs] Changes to ccvs/src/sanity.sh

[Derek Robert Price]

Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1090 ccvs/src/sanity.sh:1.1091
--- ccvs/src/sanity.sh:1.1090   Mon Sep 19 14:58:18 2005
+++ ccvs/src/sanity.sh  Fri Sep 23 03:19:23 2005
@@ -5057,24 +5057,23 @@
 ${CVSROOT_DIRNAME}/first-dir/dir/sdir/ssdir/Attic/\.file,v  <--  
\./sdir/ssdir/\.file
 new revision: 1\.1\.2\.2; previous revision: 1\.1\.2\.1"
          if $remote; then
+           # FIXCVS:
            # This is a bug, looks like that toplevel_repos cruft in
            # client.c is coming back to haunt us.
            # May want to think about the whole issue, toplevel_repos
            # has always been crufty and trying to patch it up again
            # might be a mistake.
-           dotest_fail files-12 \
-"${testcvs} commit -f -m test ./sdir/ssdir/.file ./.file" \
-"${SPROG} commit: Up-to-date check failed for .\.file'
-${SPROG} \[commit aborted\]: correct above errors first!"
+           dotest files-12r \
+"$testcvs commit -f -m test ./sdir/ssdir/.file ./.file" \
+"$CVSROOT_DIRNAME/first-dir/dir/sdir/ssdir/Attic/\.file,v  <--  
\./sdir/ssdir/\.file
+new revision: 1\.1\.2\.3; previous revision: 1\.1\.2\.2"
 
            # Sync up the version numbers so that the rest of the
            # tests don't need to expect different numbers based
            # local or remote.
-           dotest files-12-workaround \
-"${testcvs} commit -f -m test sdir/ssdir/.file .file" \
-"${CVSROOT_DIRNAME}/first-dir/dir/sdir/ssdir/Attic/\.file,v  <--  
sdir/ssdir/\.file
-new revision: 1\.1\.2\.3; previous revision: 1\.1\.2\.2
-${CVSROOT_DIRNAME}/first-dir/dir/Attic/\.file,v  <--  \.file
+           dotest files-12rworkaround \
+"$testcvs commit -f -m test .file" \
+"$CVSROOT_DIRNAME/first-dir/dir/Attic/\.file,v  <--  \.file
 new revision: 1\.1\.2\.3; previous revision: 1\.1\.2\.2"
          else
            dotest files-12 \
@@ -5225,7 +5224,7 @@
                # Now note our status
                dotest status-1 "${testcvs} status tfile" \
 "===================================================================
-File: tfile                    Status: File had conflicts on merge
+File: tfile                    Status: Unresolved Conflict
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/tfile,v
@@ -11102,7 +11101,7 @@
          # (and read-only) .# file for writing.
          echo conflict > $file
 
-         # verify that the backup file is writable
+         # verify that the backup file is not writable
          if test -w ".#$file.1.1"; then
            fail "join-readonly-conflict-10 : .#$file.1.1 is writable"
          else
@@ -11569,7 +11568,7 @@
 
                dotest conflicts-status-1 "${testcvs} status a" \
 "===================================================================
-File: a                        Status: File had conflicts on merge
+File: a                        Status: Unresolved Conflict
 
    Working revision:   1\.2.*
    Repository revision:        1\.2    ${CVSROOT_DIRNAME}/first-dir/a,v
@@ -17828,11 +17827,13 @@
          cd ../../2/first-dir
          echo 'edits in dir 2' >binfile
          dotest binfiles-con1 "${testcvs} -q update" \
-"U binfile
-${SPROG} update: nonmergeable file needs merge
-${SPROG} update: revision 1\.3 from repository is now in binfile
-${SPROG} update: file from working directory is now in \.#binfile\.1\.2
+"$SPROG update: nonmergeable file needs merge
+$SPROG update: revision 1\.3 from repository is now in binfile
+$SPROG update: file from working directory is now in \.#binfile\.1\.2
 C binfile"
+
+         dotest_fail binfiles-con1b "$testcvs -q up" "C binfile"
+
          dotest binfiles-con2 "cmp binfile ../../1/binfile.dat" ''
          dotest binfiles-con3 "cat .#binfile.1.2" 'edits in dir 2'
 
@@ -18789,29 +18790,15 @@
          cd ../..
          cd m1/first-dir
          echo "changed in m1" >aa
-         if $remote; then
-           # The tagged text code swallows up "U aa" but isn't yet up to
-           # trying to figure out how it interacts with the "C aa" and
-           # other stuff.  The whole deal of having both is pretty iffy.
-           dotest mwrap-7 "${testcvs} -nq update" \
-"${SPROG} update: nonmergeable file needs merge
-${SPROG} update: revision 1\.2 from repository is now in aa
-${SPROG} update: file from working directory is now in \.#aa\.1\.1
-C aa
-U aa"
-         else
-           dotest mwrap-7 "${testcvs} -nq update" \
-"U aa
-${SPROG} update: nonmergeable file needs merge
-${SPROG} update: revision 1\.2 from repository is now in aa
-${SPROG} update: file from working directory is now in \.#aa\.1\.1
+           dotest mwrap-7 "$testcvs -nq update" \
+"$SPROG update: nonmergeable file needs merge
+$SPROG update: revision 1\.2 from repository is now in aa
+$SPROG update: file from working directory is now in \.#aa\.1\.1
 C aa"
-         fi
-         dotest mwrap-8 "${testcvs} -q update" \
-"U aa
-${SPROG} update: nonmergeable file needs merge
-${SPROG} update: revision 1\.2 from repository is now in aa
-${SPROG} update: file from working directory is now in \.#aa\.1\.1
+         dotest mwrap-8 "$testcvs -q update" \
+"$SPROG update: nonmergeable file needs merge
+$SPROG update: revision 1\.2 from repository is now in aa
+$SPROG update: file from working directory is now in \.#aa\.1\.1
 C aa"
          dotest mwrap-9 "cat aa" "changed in m2"
          dotest mwrap-10 "cat .#aa.1.1" "changed in m1"