darcs

Issue 1588 option for darcs pull to just get non-conflicting patches

Title option for darcs pull to just get non-conflicting patches
Priority wishlist Status resolved
Milestone Resolved in
Superseder Nosy List darcs-devel, dmitry.kurochkin, ganesh, kowey, simonmar
Assigned To ganesh
Topics Conflicts, Matchers

Created on 2009-08-30.10:14:39 by ganesh, last changed 2010-03-23.16:06:58 by kowey.

Messages
msg8591 (view) Author: ganesh Date: 2009-08-30.10:14:34
Quite a few people (at least me and Simon Marlow) like to resolve conflicts one
at a time. The natural workflow for this is to pull all non-conflicting patches
first, and then pull the conflicting ones one at a time, but I don't know of any
easy way of getting the non-conflicting ones first.
msg8592 (view) Author: kowey Date: 2009-08-30.10:19:18
Just tacking on issue1263 as a related bug (it wants a 'conflicted'
matcher)
msg8614 (view) Author: kowey Date: 2009-08-31.08:33:30
Might as well merge this with issue1263
msg8711 (view) Author: ganesh Date: 2009-09-05.22:45:33
I'm not actually convinced that what's needed for this bug is the same as for
issue1263; in particular --match is about existing properties of patches whereas
the option to pull would be more about potential conflicts. It also has to cover
conflicting patches and dependencies of conflicts, whereas a --match option
might well not do that.

Removing the duplicate for now but happy to discuss it further.
msg8712 (view) Author: ganesh Date: 2009-09-05.22:50:42
I've investigated a bit and I see two possible implementations (both of which
are quite easy to actually do; I already prototyped one of them).

One option is a new flag, --only-unconflicted (happy to discuss the name too).

This would cause darcs pull (and for free darcs apply since it goes through the
same code path anyway) to filter the list of selected patches before applying
them to the repo.

The second option is to tweak the behaviour of the existing
--dont-allow-conflicts flag (and perhaps the similar flag for darcs apply).
Right now it just errors out if the selected set of patches have any conflicts.
However an alternative would be to change it so it acts as a filter on the list
of patches presented to the user for selection (or that -a would select
automatically). This has the appeal of being conceptually simpler, and also
giving the user the opportunity to see what patches they are getting. However I
don't know what the impact of changing the existing behaviour of the flag would be.
msg10457 (view) Author: kowey Date: 2010-03-23.16:06:47
This was resolved in Darcs 2.4 with the introduction of the new
--skip-conflicts flag
History
Date User Action Args
2009-08-30 10:14:39ganeshcreate
2009-08-30 10:19:20koweysetnosy: kowey, darcs-devel, ganesh, simonmar, dmitry.kurochkin
messages: + msg8592
2009-08-31 08:33:32koweysetstatus: unknown -> duplicate
nosy: kowey, darcs-devel, ganesh, simonmar, dmitry.kurochkin
superseder: + --match conflicted
messages: + msg8614
2009-08-31 08:33:46koweysettopic: + Matchers
nosy: kowey, darcs-devel, ganesh, simonmar, dmitry.kurochkin
2009-09-05 22:45:38ganeshsetstatus: duplicate -> has-patch
nosy: kowey, darcs-devel, ganesh, simonmar, dmitry.kurochkin
superseder: - --match conflicted
messages: + msg8711
2009-09-05 22:50:48ganeshsetnosy: kowey, darcs-devel, ganesh, simonmar, dmitry.kurochkin
messages: + msg8712
assignedto: ganesh
2009-10-23 22:36:41adminsetnosy: + marlowsd, - simonmar
2009-10-23 23:35:11adminsetnosy: + simonmar, - marlowsd
2009-10-28 23:25:00koweylinkpatch19 issues
2010-03-23 16:06:58koweysetstatus: has-patch -> resolved
messages: + msg10457