From 773db5a35e5b81fee3f1f8bf48dffc1dd4f3e2fe Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 18 Jul 2010 16:28:39 -0400 Subject: avoid error if two source files render the same destination file There are two sub-caces. If both source files still exist, the winner that renders the destination file is undefined. If one source file is deleted and the other added, in a refresh, the new file will take over the destination file. --- t/conflicts.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/conflicts.t') diff --git a/t/conflicts.t b/t/conflicts.t index ac270e806..81b2c12cb 100755 --- a/t/conflicts.t +++ b/t/conflicts.t @@ -2,7 +2,7 @@ # Tests for bugs relating to conflicting files in the srcdir use warnings; use strict; -use Test::More tests => 48; +use Test::More tests => 76; # setup my $srcdir="t/tmp/src"; -- cgit v1.2.3