From ed6163fbb123e5a69fe1793506d76d5984926cc3 Mon Sep 17 00:00:00 2001
From: "briano%netscape.com" <briano%netscape.com>
Date: Thu, 15 Apr 1999 01:46:04 +0000
Subject: [PATCH] Now switching back and forth between timestamp builds and
 HEAD builds ought not produce any surprises.

---
 tools/tinderbox/build-moz-ports.pl | 8 ++++++--
 tools/tinderbox/build-moz-smoke.pl | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/tinderbox/build-moz-ports.pl b/tools/tinderbox/build-moz-ports.pl
index 2e7070f3fa41..811cade2aeca 100755
--- a/tools/tinderbox/build-moz-ports.pl
+++ b/tools/tinderbox/build-moz-ports.pl
@@ -6,7 +6,7 @@ use Sys::Hostname;
 use POSIX "sys_wait_h";
 use Cwd;
 
-$Version = '$Revision: 1.19 $';
+$Version = '$Revision: 1.20 $';
 
 sub InitVars {
     # PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
@@ -374,7 +374,11 @@ sub BuildIt {
 
 	$LastTime = time;
 
-	$CVSCO = $SaveCVSCO if ( $UseTimeStamp );
+	if ( $UseTimeStamp ) {
+	    $CVSCO = $SaveCVSCO;
+	} else {
+	    $CVSCO .= ' -A';
+	}
 	$StartTime = time - 60 * 10;
 	$StartTimeStr = &CVSTime($StartTime);
 
diff --git a/tools/tinderbox/build-moz-smoke.pl b/tools/tinderbox/build-moz-smoke.pl
index 2e7070f3fa41..811cade2aeca 100755
--- a/tools/tinderbox/build-moz-smoke.pl
+++ b/tools/tinderbox/build-moz-smoke.pl
@@ -6,7 +6,7 @@ use Sys::Hostname;
 use POSIX "sys_wait_h";
 use Cwd;
 
-$Version = '$Revision: 1.19 $';
+$Version = '$Revision: 1.20 $';
 
 sub InitVars {
     # PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
@@ -374,7 +374,11 @@ sub BuildIt {
 
 	$LastTime = time;
 
-	$CVSCO = $SaveCVSCO if ( $UseTimeStamp );
+	if ( $UseTimeStamp ) {
+	    $CVSCO = $SaveCVSCO;
+	} else {
+	    $CVSCO .= ' -A';
+	}
 	$StartTime = time - 60 * 10;
 	$StartTimeStr = &CVSTime($StartTime);