[darcs-users] darcs patch: Minor style tweaks in cabal test. (and 12 more)

Eric Kow kowey at darcs.net
Mon Aug 24 10:52:16 UTC 2009


On Mon, Aug 24, 2009 at 14:19:30 +1000, Trent W. Buck wrote:
> Duplicated tests?  I think this is a merge conflict problem that
> probably needs to be resolved by removing either these, or the
> duplicated failing- ones.  Eric, do you know which ones to keep?
> 
>   + tests/broken_pipe.sh
>   + tests/dist-v.sh
>   + tests/emailformat.sh
>   + tests/issue27.sh
>   + tests/nfs-failure.sh
>   + tests/record-scaling.sh
>   + tests/time-stamps.sh

I've removed the failing variants in these in a separate patch that
I'm sending now (hmm, perhaps I should amend my conflict-resolution
instead?)
 
> Unaccounted-for deletions, insertions and modifications.  I need to
> examine the changes to these more closely.
> 
>   - bugs/bin/darcs

Seemingly useless test wrapper

>   M tests/check.sh

Cleaned up in my conflict resolution (pending review as you say)

>   + tests/failing-nice-resolutions.sh

New test by David

>   M tests/issue525_amend_duplicates.sh

Missing cleanup code probably from our branch.

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 194 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20090824/e3045be4/attachment.pgp>


More information about the darcs-users mailing list