Patch 19: Resolve issue1588: add --skip-conflicts option - Darcs bug tracker

Title	Resolve issue1588: add --skip-conflicts option
Superseder		Nosy List	ganesh, kowey, mornfall
Related Issues	option for darcs pull to just get non-conflicting patches View: 1588
Status	accepted	Assigned To	mornfall
Milestone

Created on 2009-10-28.22:11:07 by ganesh, last changed 2009-10-30.10:06:32 by kowey.

Files
File name	Status	Uploaded	Type	Edit	Remove
resolve-issue1588_-add-__skip_conflicts-option.dpatch		ganesh, 2009-10-28.22:11:06	text/x-darcs-patch
resolve-issue1588_-add-__skip_conflicts-option.dpatch		ganesh, 2009-10-29.22:13:54	text/x-darcs-patch
unnamed		ganesh, 2009-10-28.22:11:06	text/plain
unnamed		ganesh, 2009-10-29.22:13:54	text/plain

See mailing list archives for discussion on individual patches.

Messages
msg9074 (view)	Author: ganesh	Date: 2009-10-28.22:11:06
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@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. Attachments resolve-issue1588_-add-__skip_conflicts-option.dpatch unnamed
msg9079 (view)	Author: ganesh	Date: 2009-10-29.22:13:54
Hi, Extra patch added to address Petr's initial concerns. Ganesh Mon Oct 26 18:19:17 GMT 2009 Ganesh Sittampalam <ganesh@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. Thu Oct 29 21:43:23 GMT 2009 Ganesh Sittampalam <ganesh@earth.li> * add some haddock and rename a variable Attachments resolve-issue1588_-add-__skip_conflicts-option.dpatch unnamed
msg9082 (view)	Author: kowey	Date: 2009-10-30.10:06:32
Looks like Petr has applied this: http://lists.osuosl.org/pipermail/darcs-users/2009-October/021987.html

History
Date	User	Action	Args
2009-10-28 22:11:07	ganesh	create
2009-10-28 23:25:00	kowey	set	status: needs-review -> review-in-progress nosy: + mornfall issues: + option for darcs pull to just get non-conflicting patches assignedto: mornfall
2009-10-29 09:38:48	kowey	set	nosy: - patches
2009-10-29 22:13:55	ganesh	set	files: + resolve-issue1588_-add-__skip_conflicts-option.dpatch, unnamed messages: + msg9079
2009-10-30 10:06:32	kowey	set	status: review-in-progress -> accepted nosy: + kowey messages: + msg9082