Meta/cook: support 'will merge back to next'

diff --git a/cook b/cook
index da832a306ff4cd493218e561710e2eb5bf2d8a62..e3e37aacd2bea8e8819370666d9d97b9356d2e80 100755 (executable)
--- a/cook
+++ b/cook
@@ -709,7 +709,7 @@ sub tweak_willdo {
        # NEEDSWORK: does this work correctly for a half-merged topic?
        $desc =~ s/\n<<\n.*//s;
        if ($desc =~ /^  \(merged to 'next'/m) {
-               $text =~ s/^ Will merge to 'next'\.$/ $mergetomaster/m;
+               $text =~ s/^ Will merge (back )?to 'next'\.$/ $mergetomaster/m;
                $text =~ s/^ Will merge to and (then )?cook in 'next'\.$/ Will cook in 'next'./m;
                $text =~ s/^ Will merge to 'next' and (then )?to '$MASTER'\.$/ Will merge to '$MASTER'./m;
        }