Commit 1eaef2bb authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

After import, set -kb on everything to avoid keyword substitution.

parent b084a3c8
...@@ -599,6 +599,10 @@ if (!$modify || $needrepoinit) { ...@@ -599,6 +599,10 @@ if (!$modify || $needrepoinit) {
" -m 'Commit initial import back to head'") " -m 'Commit initial import back to head'")
== 0 or fatal(-1, "Could not commit to $cvsdir"); == 0 or fatal(-1, "Could not commit to $cvsdir");
# No keyword subst.
System("cd $tmpdir; $CVSBIN -Q -d $cvsdir admin -kb")
== 0 or fatal(-1, "Could not set -kb in $cvsdir");
# #
# Now tag the CVS repo with the current guid/vers so we can find it easily. # Now tag the CVS repo with the current guid/vers so we can find it easily.
# #
...@@ -696,6 +700,10 @@ else { ...@@ -696,6 +700,10 @@ else {
System("cd $tmpdir; $CVSBIN -d $cvsdir admin -b") System("cd $tmpdir; $CVSBIN -d $cvsdir admin -b")
== 0 or fatal(-1, "Could not clear default branch in $cvsdir"); == 0 or fatal(-1, "Could not clear default branch in $cvsdir");
# No keyword subst.
System("cd $tmpdir; $CVSBIN -Q -d $cvsdir admin -kb")
== 0 or fatal(-1, "Could not set -kb in $cvsdir");
# #
# Now tag the CVS repo with the current guid/vers so we can # Now tag the CVS repo with the current guid/vers so we can
# find it easily. # find it easily.
......
...@@ -101,6 +101,8 @@ my $archcontrol = "$TB/bin/archive_control"; ...@@ -101,6 +101,8 @@ my $archcontrol = "$TB/bin/archive_control";
my $eventcontrol= "$TB/bin/eventsys_control"; my $eventcontrol= "$TB/bin/eventsys_control";
my $tevc = "$TB/bin/tevc"; my $tevc = "$TB/bin/tevc";
my $CVSBIN = "/usr/bin/cvs"; my $CVSBIN = "/usr/bin/cvs";
my $FIND = "/usr/bin/find";
my $RCS = "/usr/bin/rcs";
# Protos # Protos
sub ParseArgs(); sub ParseArgs();
...@@ -552,6 +554,14 @@ if (defined($instance->runidx())) { ...@@ -552,6 +554,14 @@ if (defined($instance->runidx())) {
symlink($linkvalue, "$instance_dir/$pathname"); symlink($linkvalue, "$instance_dir/$pathname");
} }
# No keyword subst.
System("$FIND $cvsdir/$guid/records/$exptidx,$runidx ".
" -name '*,v' -print -exec $RCS -q -kb '{}' \\;")
== 0 or fatal(-1, "Could not set -kb in $cvsdir");
# And kill the temp dir.
System("/bin/rm -rf $tmpdir");
# Now tag it with the same tag that was applied for the instance. # Now tag it with the same tag that was applied for the instance.
# Apply to the branch tag directly instead of symbolically since that # Apply to the branch tag directly instead of symbolically since that
# does not work properly for some reason. # does not work properly for some reason.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment