On Mon, Oct 05, 2009 at 14:28:29 +0100, Sittampalam, Ganesh wrote:
> With just --don't-allow-conflicts, conflicting patches are presented
> during interactive selection, but selecting one causes a later failure.
> 
> With just --skip-conflicts, conflicting patches are not presented during
> interactive selection.

It sounds like we have really three cascading choices here:

  --offer-conflicts
  --dont-offer-conflicts

  --allow-conflicts
  --dont-allow-conflicts
  
  --mark-conflicts
  --dont-mark-conflicts

With the each later one in the sequence being effectively meaningless
if you select 'dont' for the one before it.

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9

Attachment: signature.asc
Description: Digital signature

_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to