[darcs-users] [patch19] Resolve issue1588: add --skip-conflicts option

Ganesh Sittampalam ganesh at earth.li
Wed Oct 28 22:11:07 UTC 2009

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

I've got back to this patch and made a separate --skip-conflicts option. 
I've concluded that the option should be mutually exclusive with other 
conflicts options, but unfortunately we don't seem to have any 
infrastructure for doing this, so I have not done so yet [it doesn't 
really make things any worse: --mark-conflicts and 
--dont-allow-conflicts already have the same problem :-(].

This is probably something we can address in general with Neil's library.

Mon Oct 26 18:19:17 GMT 2009  Ganesh Sittampalam <ganesh at earth.li>
  * Resolve issue1588: add --skip-conflicts option
  This option is for both pull and apply, and causes any patches that would
  cause conflicts to be skipped, either in interactive selection or by --all.

files: resolve-issue1588_-add-__skip_conflicts-option.dpatch, unnamed
messages: 9074
nosy: ganesh, patches
status: needs-review
title: Resolve issue1588: add --skip-conflicts option

Darcs bug tracker <bugs at darcs.net>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: resolve-issue1588_-add-__skip_conflicts-option.dpatch
Type: text/x-darcs-patch
Size: 69863 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20091028/bd45a516/attachment-0001.bin>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: unnamed
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20091028/bd45a516/attachment-0001.diff>

More information about the darcs-users mailing list