diff options
| author | Erik Andrén <erik.andren@gmail.com> | 2008-10-18 21:17:40 +0200 |
|---|---|---|
| committer | Erik Andrén <erik.andren@gmail.com> | 2008-10-18 21:17:40 +0200 |
| commit | 1afa0406859b066231f47f88c299ffc1b0cb9dbd (patch) | |
| tree | 736a6d861bfe6095c47a0f44d2027d6cbad332da /v4l/scripts | |
| parent | b5ceeeed51a17ebaa654580e5ec3ee142b09cbc7 (diff) | |
| parent | 231040087dff5af7cba45e62b8e82d5c5835f348 (diff) | |
| download | mediapointer-dvb-s2-1afa0406859b066231f47f88c299ffc1b0cb9dbd.tar.gz mediapointer-dvb-s2-1afa0406859b066231f47f88c299ffc1b0cb9dbd.tar.bz2 | |
Merge gspca tree
From: Erik Andrén <erik.andren@gmail.com>
Priority: normal
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Diffstat (limited to 'v4l/scripts')
| -rwxr-xr-x | v4l/scripts/hg-pull-req.pl | 6 |
1 files changed, 4 insertions, 2 deletions
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; |