3 # Some tests for the behavior when there is a conflict in _darcs/patches/pending
6 use Test
::More
'no_plan';
14 open(PENDING
,'>_darcs/patches/pending') || die "couldn't open pending: $!";
17 addfile ./date_moved.t
18 move ./date.t ./date_moved.t
22 # now watch the fireworks as all sorts of things fail
23 like
( darcs
('whatsnew'), qr/pending has conflicts/, "darcs whatsnew reports 'pending has conflicts'");
27 my $revert_output = darcs
'revert -a';
28 like
($revert_output, qr/pending has conflicts/, 'darcs revert reports "pending has conflicts"');
32 my $record_output = darcs
'record -a -m foo';
33 like
($record_output, qr/pending has conflicts/, 'darcs record reports "pending has conflicts"');
35 like
( darcs
('repair'), qr/The repository is already consistent, no changes made/i, 'darcs repair finds no problem');