From 090fe04ba202dfdd4695f0bf1ec7ab7279f775b3 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Mon, 19 Mar 2012 11:54:16 -0700 Subject: [PATCH] test that forcemerge of fixed and found versions works --- t/12_merge.t | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/t/12_merge.t b/t/12_merge.t index 5b76f72..2ae7833 100644 --- a/t/12_merge.t +++ b/t/12_merge.t @@ -1,6 +1,6 @@ # -*- mode: cperl;-*- -use Test::More tests => 29; +use Test::More tests => 32; use warnings; use strict; @@ -165,6 +165,8 @@ affects 2 bleargh forwarded 2 http://example.com/2 close 2 tag -3 wontfix +fixed -4 1.2-3 +found -4 1.2-1 thanks EOF ; @@ -189,6 +191,11 @@ test_control_commands(forcemerge => {command => 'forcemerge', status_key => 'mergedwith', status_value => '2 5', }, + forcemerge => {command => 'forcemerge', + value => '2 6', + status_key => 'mergedwith', + status_value => '2 5 6', + }, ); -- 2.39.2