[darcs-users] darcs patch: Resolve issue1588: make--dont-allow-conflicts filter ...

[Eric Kow]

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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20091005/6bd12096/attachment.pgp>