From 42da15fd4491ffc87425d4942c97f4fe22b3f94d Mon Sep 17 00:00:00 2001
From: Tobias Lorenz <tobias.lorenz@gmx.net>
Date: Wed, 15 Oct 2008 19:06:40 +0200
Subject: merges from main

---
 v4l/scripts/hg-pull-req.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'v4l')

diff --git a/v4l/scripts/hg-pull-req.pl b/v4l/scripts/hg-pull-req.pl
index 66de967eb..09f0b513f 100755
--- a/v4l/scripts/hg-pull-req.pl
+++ b/v4l/scripts/hg-pull-req.pl
@@ -81,9 +81,11 @@ if (`hg outgoing $from_repo` !~ /^no changes found$/m ||
 
 open IN, "hg outgoing -M $to_repo |";
 while(<IN>) {
-    if(/^changeset:\s+\d+:([[:xdigit:]]{12})$/) {
+    if(/^changeset:\s+\d+:([[:xdigit:]]+)$/) {
 	push @changesets, $1;
-    } elsif(/^summary:\s+(\S.*)$/) {
+    } elsif(/^description:$/) {
+	$_ = <IN>;
+	/^(\S.*)$/;
 	if ($1 =~ /^merge:/) {
 	    # Skip merge changesets
 	    pop @changesets;
-- 
cgit v1.2.3