Author: hmbrand
Date: Fri Sep 18 00:42:06 2009
New Revision: 13365
Modified:
dbi/trunk/MANIFEST.SKIP
dbi/trunk/Makefile.PL
dbi/trunk/git-svn-vsn.pl
Log:
git stuff cleanup
Modified: dbi/trunk/MANIFEST.SKIP
==============================================================================
--- dbi/trunk/MANIFEST.SKIP (original)
+++ dbi/trunk/MANIFEST.SKIP Fri Sep 18 00:42:06 2009
@@ -24,3 +24,4 @@
^mail/
^t/zz_\w+_pp.t$
^.git
+^git-
Modified: dbi/trunk/Makefile.PL
==============================================================================
--- dbi/trunk/Makefile.PL (original)
+++ dbi/trunk/Makefile.PL Fri Sep 18 00:42:06 2009
@@ -151,6 +151,9 @@
$_ = '' unless defined $_;
}
+# If working from git-svn, the $Id$'s in the mod's should be completed
+# before any other action is taken
+$is_developer && -d ".git" && -f "git-svn-vsn.pl" and system $^X,
"git-svn-vsn.pl";
$Verbose = $::opt_v;
WriteMakefile(
@@ -245,6 +248,8 @@
if '.h' eq substr( $_, -2 ) || '.xst' eq substr( $_, -4 );
}, '.' );
+ delete $self->{$_}{"git-svn-vsn.pl"} for qw( PM MAN3PODS );
+
return '';
}
Modified: dbi/trunk/git-svn-vsn.pl
==============================================================================
--- dbi/trunk/git-svn-vsn.pl (original)
+++ dbi/trunk/git-svn-vsn.pl Fri Sep 18 00:42:06 2009
@@ -48,12 +48,8 @@
=head1 SYNOPSYS
- test_dynamic :: pure_all
- perl git-svn-vsn.pl
- PERL_DL_NONLAZY=1 $(FULLPERLRUN) "-MExtUtils::Command::MM" "-e"
"test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')" $(TEST_FILES)
- PERL_DL_NONLAZY=1 $(FULLPERLRUN) "-I$(INST_LIB)"
"-I$(INST_ARCHLIB)" $(TEST_FILE)
- git co `cat git-svn-modlist`
- rm git-svn-modlist
+ $ git-svn-vsn.pl
+ $ git chechout `cat git-svn-modlist`
=head1 DESCRIPTION
@@ -77,8 +73,10 @@
C<make test> can revert to the actual files from the repository after the tests
have been run with C<git checkout `cat git-svn-modlist`>.
-Future enhancements might include encorporating this into Makefile.PL.Currently
-the changes are handwork after C<perl Makefile.PL> has been run.
+The call to C<git-svn-vsn.pl> is integrated in C<Makefile.PL> Before you can
+push up the committed changes with C<svn dcommit --username committer>, you
will
+have te revert the changes to the modules by doing a checkout of the changed
+files. Their names were stored in C<git-svn-modlist>.
=head1 SEE ALSO
