Portal Home > Knowledgebase > Articles Database > CVS diff question


CVS diff question




Posted by mattle, 09-22-2009, 01:34 PM
Hello all, I'm administering a CVS repository for the first time, and I'm having some strange behavior. I've got a production machine and a development machine. The CVSROOT is on the development machine, as is my main sandbox. I commit changes from my sandbox, and then update them on the production machine. For some reason, however, the production machine is not looking at the current CVS head... root@development:/data/web/www# cvs log login.php RCS file: /data/CVS/web/www/login.php,v Working file: login.php head: 1.3 branch: locks: strict access list: symbolic names: v1: 1.1.1.1 EDB: 1.1.1 keyword substitution: kv total revisions: 4; selected revisions: 4 description: ---------------------------- revision 1.3 date: 2009/09/22 17:25:43; author: mleonhar; state: Exp; lines: +2 -0 Testing prod diffs...--ml ---------------------------- revision 1.2 date: 2009/09/14 21:04:34; author: mleonhar; state: Exp; lines: +1 -1 Fixed dev/prod compatibility issues --ml ---------------------------- revision 1.1 date: 2009/09/14 19:58:03; author: mleonhar; state: Exp; branches: 1.1.1; Initial revision ---------------------------- revision 1.1.1.1 date: 2009/09/14 19:58:03; author: mleonhar; state: Exp; lines: +0 -0 Initial import -- ml ============================================================================= root@development:/data/web/www# cvs diff login.php root@development:/data/web/www# And, from production: root@production:/data/web/www# cvs diff login.php root@production:/data/web/www# date Tue Sep 22 13:32:17 EDT 2009 root@production:/data/web/www# cvs diff -D 09/23/2009 login.php Index: login.php =================================================================== RCS file: /data/CVS/web/www/login.php,v retrieving revision 1.3 retrieving revision 1.2 diff -r1.3 -r1.2 13,14d12 < //ini_set("error_reporting", E_ALL); < I get the same output from "cvs log" on production, so it knows that the head is v1.3, however, it refuses to diff against it. Am I missing something here?? TIA



Was this answer helpful?

Add to Favourites Add to Favourites    Print this Article Print this Article

Also Read
sudo & APF (Views: 387)