cvs-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch]


From: Derek Robert Price
Subject: [Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch]
Date: Sat, 10 Jun 2006 15:55:57 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <dprice>     06/06/10 15:55:55

Modified files:
        src            : ChangeLog sanity.sh 

Log message:
        * sanity.sh (conflicts4): Don't expect specific file permissions.  Use
        $PLUS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.458&r2=1.2336.2.459
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.752.2.200&r2=1.752.2.201

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.458
retrieving revision 1.2336.2.459
diff -u -b -r1.2336.2.458 -r1.2336.2.459
--- ChangeLog   9 Jun 2006 02:06:16 -0000       1.2336.2.458
+++ ChangeLog   10 Jun 2006 15:55:54 -0000      1.2336.2.459
@@ -1,3 +1,8 @@
+2006-06-10  Derek Price  <address@hidden>
+
+       * sanity.sh (conflicts4): Don't expect specific file permissions.  Use
+       $PLUS.
+
 2006-06-08  Derek Price  <address@hidden>
 
        * sanity.sh (conflicts4): Test that the client honors Empty-conflicts.

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.752.2.200
retrieving revision 1.752.2.201
diff -u -b -r1.752.2.200 -r1.752.2.201
--- sanity.sh   9 Jun 2006 02:10:36 -0000       1.752.2.200
+++ sanity.sh   10 Jun 2006 15:55:54 -0000      1.752.2.201
@@ -11402,9 +11402,9 @@
 Argument --
 Directory .
 $CVSROOT_DIRNAME/first-dir
-Entry /file1/1.2/+=//
+Entry /file1/1.2/$PLUS=//
 Modified file1
-u=rw,g=rw,o=r
+u=.*,g=.*,o=.*
 59
 baseline
 ""<<<<<<< file1
@@ -11436,7 +11436,7 @@
 Argument --
 Directory .
 $CVSROOT_DIRNAME/first-dir
-Entry /file1/1.2/+=//
+Entry /file1/1.2/$PLUS=//
 Unchanged file1
 update"
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]