Initially, I took the holistic view and compared the status before and after this entire part of the bundle. Below is a summary.
> Then look at David's patches against his repo (ie. sans conflictors): > * move bugs into tests/ directory. > * mark issue 525 is no longer failing. > * clean up and mark as passing the broken-pipe.sh test. > * mark check.sh as failing. > * mark dist-v as passing. > * mark nfs-failure.sh as passing (even though it might not be fixed). > * mark issue 1043 test as passing. > * mark issue27 test as passing. > * mark check.sh test as passing. > * add failing test demonstrating nasty conflict markings. > > And finally... > * Resolve conflicts between David and mainline test suite work. Matching deletions and insertions. All that happens is these files moved; their contents are unchanged. - bugs/ add_permissions.sh + tests/failing-add_permissions.sh - bugs/ dist-v.sh + tests/failing-dist-v.sh - bugs/ emailformat.sh + tests/failing-emailformat.sh - bugs/ issue1013_either_dependency.sh + tests/failing-issue1013_either_dependency.sh - bugs/ issue1014_identical_patches.sh + tests/failing-issue1014_identical_patches.sh - bugs/ issue1190_unmarked_hunk_replace_conflict.sh + tests/failing-issue1190_unmarked_hunk_replace_conflict.sh - bugs/ issue1196_whatsnew_falsely_lists_all_changes.sh + tests/failing-issue1196_whatsnew_falsely_lists_all_changes.sh - bugs/ issue1266_init_inside_a_repo.sh + tests/failing-issue1266_init_inside_a_repo.sh - bugs/ issue1327.sh + tests/failing-issue1327.sh - bugs/ issue1337_darcs_changes_false_positives.sh + tests/failing-issue1337_darcs_changes_false_positives.sh - bugs/ issue1396_changepref-conflict.sh + tests/failing-issue1396_changepref-conflict.sh - bugs/ issue1401_bug_in_get_extra.sh + tests/failing-issue1401_bug_in_get_extra.sh - bugs/ issue1406.sh + tests/failing-issue1406.sh - bugs/ issue1442_encoding_round-trip.sh + tests/failing-issue1442_encoding_round-trip.sh - bugs/ issue1461_case_folding.sh + tests/failing-issue1461_case_folding.sh - bugs/ issue1473_annotate_repodir.sh + tests/failing-issue1473_annotate_repodir.sh - bugs/ issue27.sh + tests/failing-issue27.sh - bugs/ issue390_whatsnew.sh + tests/failing-issue390_whatsnew.sh - bugs/ issue558_broken_pipe.sh + tests/failing-issue558_broken_pipe.sh - bugs/ issue944_partial_inventory.sh + tests/failing-issue944_partial_inventory.sh - bugs/ merging_newlines.sh + tests/failing-merging_newlines.sh - bugs/ newlines.sh + tests/failing-newlines.sh - bugs/ nfs-failure.sh + tests/failing-nfs-failure.sh - bugs/ record-scaling.sh + tests/failing-record-scaling.sh - bugs/ time-stamps.sh + tests/failing-time-stamps.sh 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 Unaccounted-for deletions, insertions and modifications. I need to examine the changes to these more closely. - bugs/bin/darcs M tests/check.sh + tests/failing-nice-resolutions.sh M tests/issue525_amend_duplicates.sh _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
