From fbaca6a4740801cff51b25ffbfe1dd3a1176cdef Mon Sep 17 00:00:00 2001 From: "fur%netscape.com" Date: Wed, 4 Nov 1998 23:02:28 +0000 Subject: [PATCH] Finished -commit option git-svn-id: svn://10.0.0.236/trunk@14110 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/landbranch.pl | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/mozilla/js/landbranch.pl b/mozilla/js/landbranch.pl index c5ea0041b3a..77ca9c8382c 100755 --- a/mozilla/js/landbranch.pl +++ b/mozilla/js/landbranch.pl @@ -1,7 +1,6 @@ #! /usr/local/bin/perl5 use File::Path; -#use File::Copy; # The development branch is where primary development and checkins # are done on a day-to-day basis. @@ -86,17 +85,6 @@ This script will assist with steps #2, #4 and #6: END } -sub process_checkout { - local (*FH,*files) = @_; - - while () { - if (/^[UP] (.*)/) { - $file = $1; - $files{$file} = 1; - } - } -} - sub log { local($msg) = @_; print LOGFILE $msg if $logfile; @@ -215,12 +203,22 @@ if ($do_merge) { if ($do_commit) { &die("No merged tree found. Wrong directory ?") if (!chdir $trunk_dir); - &die("-commit not implemented yet"); - &system("cvs ci"); # Message ? + ($_,$_,$_,$day,$mon,$year,$_,$_) = localtime(time()); + if ($year < 30) { + $year = "20" . $year; + } else { + $year = "19" . $year; + } + + $mmddyyyy = sprintf("%02d%02d%s", $mon, $day, $year); + + print("Checking in code on trunk"); + &system("cvs ci -m 'Stable drop of JavaScript interpreter code from " . + "$development_branch'"); # Tag merged result - &system("cvs tag JS_LANDING"); - &system("cvs tag JS_LANDING_mmddyyyy"); + &system("cvs tag -F JS_LANDING"); + &system("cvs tag -F JS_LANDING_$mmddyyyy"); # Move JS_LAST_STABLE_DROP tag forward &system("cvs tag -F -rJS_STABLE_DROP JS_LAST_STABLE_DROP");