From 42da15fd4491ffc87425d4942c97f4fe22b3f94d Mon Sep 17 00:00:00 2001 From: Tobias Lorenz Date: Wed, 15 Oct 2008 19:06:40 +0200 Subject: merges from main --- hgimport | 6 +++--- v4l/scripts/hg-pull-req.pl | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hgimport b/hgimport index d12c84f81..75cc4ae97 100755 --- a/hgimport +++ b/hgimport @@ -104,6 +104,6 @@ done # To cherry pick all files, you can do something like: -#for i in $TMP/newpatches/*; do -# hg import $i; -#done +for i in $TMP/newpatches/*; do + hg import $i; +done 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() { - if(/^changeset:\s+\d+:([[:xdigit:]]{12})$/) { + if(/^changeset:\s+\d+:([[:xdigit:]]+)$/) { push @changesets, $1; - } elsif(/^summary:\s+(\S.*)$/) { + } elsif(/^description:$/) { + $_ = ; + /^(\S.*)$/; if ($1 =~ /^merge:/) { # Skip merge changesets pop @changesets; -- cgit v1.2.3