[darcs-devel] [patch1437] Add some tests for how conflicts are rep... (and 2 more)

Ganesh Sittampalam bugs at darcs.net
Thu Jan 21 18:32:00 UTC 2016


New submission from Ganesh Sittampalam <ganesh at earth.li>:

Some cleanups for conflict reporting

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

patch 7c38cde1441998f774de137f6b0ca7373000b328
Author: Ganesh Sittampalam <ganesh at 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 at 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 at 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.

----------
files: add-some-tests-for-how-conflicts-are-reported.dpatch, patch-preview.txt, unnamed
messages: 18952
nosy: ganesh
status: needs-screening
title: Add some tests for how conflicts are rep... (and 2 more)

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1437>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 5643 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20160121/48c0acf6/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: add-some-tests-for-how-conflicts-are-reported.dpatch
Type: application/x-darcs-patch
Size: 36246 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20160121/48c0acf6/attachment-0003.bin>
-------------- next part --------------
.






More information about the darcs-devel mailing list