ooo-build r13416 - in trunk: . git

[jannieuw svn gnome org]

Author: jannieuw
Date: Mon Jul 28 12:20:18 2008
New Revision: 13416
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13416&view=rev

Log:
2008-07-28  Jan Nieuwenhuizen  <janneke gnu org>

	* git/git-svn.perl.diff: Strip bits harder.


Modified:
   trunk/ChangeLog
   trunk/git/git-svn.perl.diff

Modified: trunk/git/git-svn.perl.diff
==============================================================================
--- trunk/git/git-svn.perl.diff	(original)
+++ trunk/git/git-svn.perl.diff	Mon Jul 28 12:20:18 2008
@@ -1,6 +1,6 @@
-From f3148bd5b237c90d55e0f85642730011384c55ad Mon Sep 17 00:00:00 2001
+From 13a8a43f057875d8499bf2d0b99e57f79258bcf1 Mon Sep 17 00:00:00 2001
 From: Jan Nieuwenhuizen <janneke gnu org>
-Date: Fri, 25 Jul 2008 16:05:38 +0200
+Date: Mon, 28 Jul 2008 14:16:59 +0200
 Subject: [PATCH] git-svn.perl: strip ChangeLog bits.
 
 ---
@@ -8,7 +8,7 @@
  1 files changed, 13 insertions(+), 1 deletions(-)
 
 diff --git a/git-svn.perl b/git-svn.perl
-index 2e0e552..c7ee218 100755
+index cf6dbbc..47524bf 100755
 --- a/git-svn.perl
 +++ b/git-svn.perl
 @@ -66,7 +66,7 @@ my ($_stdin, $_help, $_edit,
@@ -37,7 +37,7 @@
  
  	$log_entry{date} = parse_svn_date($log_entry{date});
 +	if (defined $_cut_changelog_bits) {
-+	    $log_entry{log} =~ s/^(\s*(199|200)}[0-9](-[0-9]{2}){2}\s+.*<.*>\n\s+)//;
++	    $log_entry{log} =~ s/^((\n|\s)*(199|200)[0-9](-[0-9]{2}){2}\s+.*<.*>\s*\n\s+)//;
 +	    $log_entry{log} =~ s/(^|\n)\s*/$1/g;
 +	    $log_entry{log} =~ s/(^|\n)\* /\n$1/g;
 +            # $log_entry{log} =~ s/(^|\n)\* [^ \t():]+\s*(\([^)]+\)([, \t\n]*))*\s*:\s*/$1\n/g;
@@ -50,5 +50,5 @@
  	my $author = $log_entry{author} = check_author($log_entry{author});
  	my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}
 -- 
-1.5.6.3.317.g5d44c9.dirty
+1.6.0.rc0.44.g67270