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
pgpNVAGrchYCl.pgp
Description: PGP signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
