From 84eeeede84da7a1a7eb7bd1030ce8d9dc782bcba Mon Sep 17 00:00:00 2001
From: cjwatson <>
Date: Tue, 3 Feb 2004 21:37:45 -0800
Subject: [PATCH] [project @ 2004-02-03 21:37:45 by cjwatson] Allow # prefix on
 bug numbers in 'merge' command.

---
 debian/changelog   | 1 +
 scripts/service.in | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9683999..1c2e8af 100644
--- 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 59d5c09..9f2e39c 100755
--- 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;
-- 
2.39.2