Patch 445: in with_partial_intersection, we only ne... (and 2 more) - Darcs bug tracker

Title	in with_partial_intersection, we only ne... (and 2 more)
Superseder		Nosy List	galbolle, ganesh
Related Issues
Status	accepted	Assigned To
Milestone

Created on 2010-11-03.11:44:49 by galbolle, last changed 2012-05-10.10:18:46 by galbolle. Tracked on DarcsWatch.

Files
File name	Status	Uploaded	Type	Edit	Remove
in-with_partial_intersection_-we-only-need-to-assert-that-the-middle-witness-_wa_-is-correct.dpatch		galbolle, 2012-04-01.14:30:47	application/x-darcs-patch
make-finduncommon-and-findcommonwiththem-into-findcommonanduncommon.dpatch		galbolle, 2010-11-03.11:44:48	text/x-darcs-patch
patch-preview.txt		galbolle, 2012-04-01.14:30:47	text/x-darcs-patch
unnamed		galbolle, 2010-11-03.11:44:48
unnamed		galbolle, 2012-04-01.14:30:47

See mailing list archives for discussion on individual patches.

Messages
msg12893 (view)	Author: galbolle	Date: 2010-11-03.11:44:48
This is for discussion rather than immediate application. Grumpy old man story is I like to open a .dpatch in an editor to ponder the situation when I know there will be conflicts. Currently, I can do darcs pull --skip-conflicts --match "patches i want" then darcs fetch --match "patches i want" to get a minimal conflicted bundle, but it does not play nicely with interactive selection, since I need 2 commands. I think [some equivalent] of the first patch should be applied so that library users can get more precise witnesses out of Darcs.Patch.Depend.findCommon . Florent 2 patches for repository http://darcs.net: Fri Oct 29 18:31:23 CEST 2010 Florent Becker <florent.becker@ens-lyon.org> * Make findUncommon and findCommonWithThem into findCommonAndUncommon Wed Nov 3 12:32:54 CET 2010 Florent Becker <florent.becker@ens-lyon.org> * Add a --skip-conflict option fetching but not applying conflicted patches Attachments make-finduncommon-and-findcommonwiththem-into-findcommonanduncommon.dpatch unnamed
msg13020 (view)	Author: ganesh	Date: 2010-11-14.13:53:35
This patch looks fine technically. I suggest we apply the first one immediately. I'm a bit concerned about the option proliferation of --split-conflicts. I understand your use case, but I wonder if we wouldn't do better to improve our story around handling conflicts in the repo, rather than trying to make an ever more elaborate set of options for keeping patches in .dpatch files. I wonder if multi-head repos are the answer. On the other hand, perhaps local .dpatch files are the answer instead of having multi-head repos...
msg13076 (view)	Author: mornfall	Date: 2010-11-15.22:58:54
(As an aside: I am not sure this is actually true, as I haven't thought about this too much and it's been a while, but I suspect it may prevent a fix for the duplicate patch issue(s) -- see issue1868 and issue1014 for details, hopefully.)
msg13848 (view)	Author: ganesh	Date: 2011-04-01.13:01:02
IRC discussion relating to mornfall's comment above: http://irclog.perlgeek.de/darcs/2010-11-15#i_2997168
msg15486 (view)	Author: galbolle	Date: 2012-04-01.14:30:47
3 patches for repository http://darcs.net: Sun Apr 1 16:07:56 CEST 2012 Florent Becker <florent.becker@ens-lyon.org> * in with_partial_intersection, we only need to assert that the middle witness (wA) is correct Sun Apr 1 16:10:17 CEST 2012 Florent Becker <florent.becker@ens-lyon.org> * More precise witnesses for with_partial_intersection Sun Apr 1 16:28:46 CEST 2012 Florent Becker <florent.becker@ens-lyon.org> * Make findUncommon and findCommonWithThem into findCommonAndUncommon Attachments in-with_partial_intersection_-we-only-need-to-assert-that-the-middle-witness-_wa_-is-correct.dpatch patch-preview.txt unnamed
msg15660 (view)	Author: galbolle	Date: 2012-05-10.10:18:46
Accepted, without --skip-conflicts, where it is not worth having yet another flag.

History
Date	User	Action	Args
2010-11-03 11:44:49	galbolle	create
2010-11-03 11:45:46	darcswatch	set	darcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-a5201d4b0cb4b47660d4195dc73744b018524051
2010-11-14 13:53:36	ganesh	set	nosy: + ganesh messages: + msg13020
2010-11-14 13:54:20	ganesh	set	status: needs-screening -> review-in-progress
2010-11-15 22:58:54	mornfall	set	messages: + msg13076
2011-04-01 13:01:02	ganesh	set	messages: + msg13848
2011-05-10 20:35:34	darcswatch	set	darcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-a5201d4b0cb4b47660d4195dc73744b018524051 -> http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-a5201d4b0cb4b47660d4195dc73744b018524051
2012-04-01 14:30:48	galbolle	set	files: + patch-preview.txt, in-with_partial_intersection_-we-only-need-to-assert-that-the-middle-witness-_wa_-is-correct.dpatch, unnamed messages: + msg15486 title: Make findUncommon and findCommonWithThem... (and 1 more) -> in with_partial_intersection, we only ne... (and 2 more)
2012-05-10 10:18:00	galbolle	set	status: review-in-progress -> accepted
2012-05-10 10:18:46	galbolle	set	messages: + msg15660