We've been using 1.10 on our NT clients for a while, but we had 1.9 on the server. We recently upgraded the server to 1.10. It's been working reasonably well, but we've recently started seeing an anomaly when we try to do a "cvs update" and it finds changes in a file that will have conflicts with the local copy of the file. Following this is sample output from the "cvs -t update" (show trace output), showing the error message at the end. Also note that when I get this message, the update stops, not processing any more files. The workaround is to move the file out of the way, re- update, and manually merge the changes back in, but I obviously don't want to do this all of the time.
One minor issue is that my local $HOME/.cvsrc file has "diff -c", so I would expect diff output would be in context diff format, but I guess this "diff" output must be different from that. Here is an excerpt from the "cvs -t update" output (note the last line): [wa02513;] cvs -t update -> Sending file `XXXSubscriberImpl.java' to server -> Sending file `YYYYSubscriberImpl.java' to server S-> unlink(CVS/Entries.Static) S-> unlink(./CVS/Entries.Static) -> unlink(CVS/Entries.Static) -> unlink(CVS/Entries.Static) cvs server: Updating . S-> checkout (/build/mafcvs/JAVA/Application/ObjectModel/GPS/GpsServer/src/com/attw s/voya ger/gps/svr/subscriber/XXXSubscriberImpl.java,v, 1.31, , (function)) S-> unlink(.#XXXSubscriberImpl.java.1.31) S-> copy(XXXSubscriberImpl.java,.#XXXSubscriberImpl.java.1.31) S-> chmod(XXXSubscriberImpl.java,100666) RCS file: /build/mafcvs/JAVA/Application/ObjectModel/GPS/GpsServer/src/com/attws /voyag er/gps/svr/subscriber/XXXSubscriberImpl.java,v retrieving revision 1.31 S-> checkout (/build/mafcvs/JAVA/Application/ObjectModel/GPS/GpsServer/src/com/attw s/voya ger/gps/svr/subscriber/XXXSubscriberImpl.java,v, 1.31, , /tmp/cvsAAAa21243) S-> checkout (/build/mafcvs/JAVA/Application/ObjectModel/GPS/GpsServer/src/com/attw s/voya ger/gps/svr/subscriber/XXXSubscriberImpl.java,v, 1.32, , /tmp/cvsBAAa21243) retrieving revision 1.32 Merging differences between 1.31 and 1.32 into XXXSubscriberImpl.java 14a15 > import com.attws.voyager.gps.svr.global.*; 42a44,46 > /** > * Create a new XXX subscriber. (Activate this subscriber). > */ 43a48,293 > String imsi, > String msisdn, > byte[] esn, [lines deleted] > > public XXXSubscriberImpl( 111c361 < public void setSubscriberAttributes(SubscriberAttributes sa) --- > public void setSubscriberAttributes(SubscriberAttributes sa,User targetUser) 183,184c433 < if (!SubscriberServiceImpl. < validRestrictionListForCarrier (sa.carrier,sa.restrictionList)) --- > if (!validRestrictionListForCarrier (sa.carrier,sa.restrictionList)) 191,192c440 < if (!SubscriberServiceImpl. < validSubscGroupForCarrier(sa.carrier,sa.subscGroup)) --- > if (!validSubscGroupForCarrier(sa.carrier,sa.subscGroup)) 238c486 < new EDSActionImpl(oldXXXimsi, oldMIN, oldESN, lastModified () , "D"); --- > // new EDSActionImpl(oldXXXimsi, oldMIN, oldESN, lastModified() , "D"); 250d497 < 256c503 < new EDSActionImpl(XXXIMSI(), min(), esn(), lastModified () , "A"); --- > // new EDSActionImpl(XXXIMSI(), min(), esn(), lastModified () , "A"); 261a509,512 > // Reset target user > if (targetUser == null) > targetUser = user; > 287c538,539 < _restrictionList); --- > _restrictionList, > targetUser); cvs server: could not open temporary diff file _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
