[project @ 2004-02-03 21:37:45 by cjwatson]

Allow # prefix on bug numbers in 'merge' command.

diff --git a/debian/changelog b/debian/changelog
index 9683999e0fbc43fce7fe6143a99afef14243406a..1c2e8afb066ac46eb6f52f47bd49036256118773 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Install Debian configuration in the binary package's examples
       directory (closes: #222118).
     - New standalone SpamAssassin queue runner, spamscan.
+    - Allow # prefix on bug numbers in 'merge' command.
 
   * Adam Heath:
     - Rewrite filtering in cgi's common.pl, to make it completely generic.

diff --git a/scripts/service.in b/scripts/service.in
index 59d5c094fcee4fa6a81c5bc9c5c879804d3098d2..9f2e39c880a658f520d64c967a475de957556fbe 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: service.in,v 1.94 2003/10/02 13:48:38 cjwatson Exp $
+# $Id: service.in,v 1.95 2004/02/03 21:37:45 cjwatson Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
@@ -526,9 +526,9 @@ END
                 } while (&getnextbug);
            }
        }
-    } elsif (m/^merge\s+(-?\d+(\s+-?\d+)+)\s*$/i) {
+    } elsif (m/^merge\s+#?(-?\d+(\s+#?-?\d+)+)\s*$/i) {
        $ok++;
-        @tomerge= sort { $a <=> $b } split(/\s+/,$1);
+        @tomerge= sort { $a <=> $b } split(/\s+#?/,$1);
         @newmergelist= ();
        my %tags = ();
         &getmerge;