Some cleanups for conflict reporting

3 patches for repository darcs-unstable@darcs.net:screened:

patch 7c38cde1441998f774de137f6b0ca7373000b328
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Thu Jan 21 07:54:55 GMT 2016
  * Add some tests for how conflicts are reported
  
  The test of 'changes' currently fails because that
  command erroneously marks all files as conflicted if
  there is a single conflict in a patch.
  

patch 988453d864a45d5b386d57273df19c71eba65a4f
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Thu Jan 21 17:36:53 GMT 2016
  * Get rid of default implementation of conflictedEffect
  
  It should only be used at "leaves", if at all.
  

patch 6b9a625733767d360d7be32e5fd703cf02fe347b
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Thu Jan 21 17:39:18 GMT 2016
  * move listConflictedFiles out of Conflict class
  
  It should always be derivable from the resolveConflicts result.

Attachments

• add-some-tests-for-how-conflicts-are-reported.dpatch
• patch-preview.txt
• unnamed

Shell test is OK (and I was not aware of that bug!).

I don't understand why the second patch fixes the bug, though. I think
listConflictedFiles does the job of listing the files, so why does
removing the default implementation of conflictedEffect change anything?

'conflictedEffect' is used in summaries, 'listConflictedFiles' is used 
when reporting conflicts on pull etc.

I'm gradually trying to simplify this mess :-)

I get it. The second patch fixes summaries (which are tested at the very
end of the shell test script). listConflictedFiles was always working
fine. OK.

About the third patch, I think I agree. Accepted!