undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn import: remove some CVS cruft

Browse Source 
Some remains of CVS still lingered. Removed.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
This commit is contained in:
Matthias Urlichs 2005-10-11 17:02:45 +02:00
parent 2fa92046a8
commit 4a91b796e3
1 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
git-svnimport.perl
View File

@ -5,8 +5,7 @@
# #
# The basic idea is to pull and analyze SVN changes. # The basic idea is to pull and analyze SVN changes.
# #
# Checking out the files is done by a single long-running CVS connection # Checking out the files is done by a single long-running SVN connection.
# / server process.
# #
# The head revision is on branch "origin" by default. # The head revision is on branch "origin" by default.
# You can change that with the '-o' option. # You can change that with the '-o' option.
@ -50,7 +49,7 @@ my $tag_name = $opt_t || "tags";
my $trunk_name = $opt_T || "trunk"; my $trunk_name = $opt_T || "trunk";
my $branch_name = $opt_b || "branches"; my $branch_name = $opt_b || "branches";
@ARGV <= 1 or usage(); @ARGV == 1 or usage();
$opt_o ||= "origin"; $opt_o ||= "origin";
$opt_s ||= 1; $opt_s ||= 1;
@ -58,18 +57,7 @@ $opt_l = 100 unless defined $opt_l;
my $git_tree = $opt_C; my $git_tree = $opt_C;
$git_tree ||= "."; $git_tree ||= ".";
my $cvs_tree; my $svn_url = $ARGV[0];
if ($#ARGV == 0) {
$cvs_tree = $ARGV[0];
} elsif (-f 'CVS/Repository') {
open my $f, '<', 'CVS/Repository' or
die 'Failed to open CVS/Repository';
$cvs_tree = <$f>;
chomp $cvs_tree;
close $f;
} else {
usage();
}
our @mergerx = (); our @mergerx = ();
if ($opt_m) { if ($opt_m) {
@ -140,7 +128,7 @@ sub file {
package main; package main;
my $svn = SVNconn->new($cvs_tree); my $svn = SVNconn->new($svn_url);
sub pdate($) { sub pdate($) {
@ -255,25 +243,6 @@ EOM
open BRANCHES,">>", "$git_dir/svn2git"; open BRANCHES,">>", "$git_dir/svn2git";
## cvsps output:
#---------------------
#PatchSet 314
#Date: 1999/09/18 13:03:59
#Author: wkoch
#Branch: STABLE-BRANCH-1-0
#Ancestor branch: HEAD
#Tag: (none)
#Log:
# See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch
#Members:
# README:1.57->1.57.2.1
# VERSION:1.96->1.96.2.1
#
#---------------------
my $state = 0;
sub get_file($$$) { sub get_file($$$) {
my($rev,$branch,$path) = @_; my($rev,$branch,$path) = @_;