Update checkout target. Add logging. Stop on conflicts. r=dougt

client.mak

@@ -72,11 +72,8 @@ CVSCO_LIBPREF = $(CVSCO) -A
 CVSCO_PLUGIN = $(CVSCO) -A
 !endif
 
-CVSCO_XPCOM = $(CVSCO)
-CVSCO_IMGLIB = $(CVSCO)
-CVSCO_RAPTOR = $(CVSCO)
-CVSCO_LIZARD = $(CVSCO)
-CVSCO_NETWORK = $(CVSCO)
+CVSCO_LAYOUT    = $(CVSCO) RaptorWin
+CVSCO_SEAMONKEY = $(CVSCO) SeaMonkeyAll
 
 ## The master target
 ############################################################
@@ -93,12 +90,29 @@ pull_all: pull_seamonkey
 
 # pull either layout only or seamonkey the browser
 pull_layout:
-	cd $(MOZ_SRC)\.
-	$(CVSCO) RaptorWin
+	cd ..
+	$(CVSCO_LAYOUT)
 
 pull_seamonkey:
-	cd $(MOZ_SRC)\.
-	$(CVSCO) SeaMonkeyAll
+	cd ..
+	if exist cvslog.txt rm cvslog-old.txt && ren cvslog.txt cvslog-old.txt
+	@perl <<
+	  sub dblprint { print LOG @_; print STDERR @_; }
+	  open LOG, ">cvslog.txt";
+	  open CVS, '$(CVSCO_SEAMONKEY)|';
+	  dblprint 'checkout start: ', `date`;
+	  dblprint '$(CVSCO_SEAMONKEY) | tee cvslog.txt'."\n";
+	  while (<CVS>) {
+            dblprint $$_;
+	    push @conflicts, $$_ if /^C /;
+	  }
+	  if (@conflicts) {
+	    print "Error: cvs conflicts during checkout:\n";
+	    die join('', @conflicts);
+	  }
+	  close(CVS) or die "cvs error.\n";
+	  dblprint 'checkout finish: ', `date`;
+<<
 
 ############################################################