bug-cvs
[Top][All Lists]
Advanced

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

Re: conflict on added files


From: Derek Robert Price
Subject: Re: conflict on added files
Date: Tue, 10 Jun 2003 11:49:06 -0400
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.2) Gecko/20030208 Netscape/7.02

Paul Edwards wrote:

       * configure.in: Update CVS version to 1.11.6.
Index: src/sanity.sh
===================================================================
RCS file: /development/repository/ccvs/src/sanity.sh,v
retrieving revision 1.1.1.6
diff -c -r1.1.1.6 sanity.sh
*** src/sanity.sh       27 May 2003 10:04:20 -0000      1.1.1.6
--- src/sanity.sh       10 Jun 2003 11:54:27 -0000
***************
*** 3890,3895 ****
--- 3890,3922 ----
               rm -rf ${CVSROOT_DIRNAME}/first-dir
               ;;

+     conflict)
+         # Test Conflict
+         mkdir ${CVSROOT_DIRNAME}/aaa
+         ${testcvs} checkout aaa >/dev/null 2>&1
+         cd aaa
+         echo aaa >one.c
+         ${testcvs} add one.c >/dev/null 2>&1
+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
+         rm one.c
+         ${testcvs} remove one.c >/dev/null 2>&1
+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
+         ${testcvs} update -j 1.2 -j 1.1 one.c >/dev/null 2>&1
+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
+         ${testcvs} tag -r 1.2 tag1 one.c >/dev/null 2>&1
+         ${testcvs} tag -r 1.3 tag2 one.c >/dev/null 2>&1
+         echo bbb >>one.c
+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
+         ${testcvs} update -j tag1 -j tag2 one.c >/dev/null 2>&1
+
+         dotest_fail conflict-1 "${testcvs} commit -m test one.c" \
+ "${PROG} [a-z]*: Up-to-date check failed for .one.c'
+ ${PROG} \[[a-z]* aborted\]: correct above errors first!"
+         cd ..
+         rm -fr aaa
+         rm -fr ${CVSROOT_DIRNAME}/aaa
+         ;;

I haven't studied this enough to be certain what you were aiming for, but CVS certainly shouldn't be reporting that one.c is not up-to-date. The update previous to your conflict-1 test should have reported a conflict, but everything is up-to-date.

Also, please test the result of all CVS invocations in sanity.sh, not just the last few.

Derek

--
               *8^)

Email: address@hidden

Get CVS support at <http://ximbiot.com>!
--
#! perl
@a = ( 0x2E805,0x6B39,0x15B3,0x45993,0x153C,0x1D9F );
for ( @a ) { ( $s, $i )=( 'a', 0 ); $s++ while $i++ < $_; print "$s" }







reply via email to

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