Issue 1263 --match conflicted

Title --match conflicted
Priority wishlist Status needs-reproduction
Milestone Resolved in
Superseder Nosy List darcs-devel, dmitry.kurochkin, galbolle, ganesh, jaredj, kowey, simonmar, thorkilnaur
Assigned To
Topics Conflicts, Matchers, UI

Created on 2008-12-09.10:50:00 by galbolle, last changed 2009-10-23.23:35:23 by admin.

msg6804 (view) Author: galbolle Date: 2008-12-09.10:49:54
It would be nice to have a 'conflicted' keyword for --match which matches the
patches in the last conflictor(s) in the repository, that is, the patches
involved in any 'live' conflict.

That way, you can see the 'live' conflicts with darcs changes --match conflicted

This would make it especially convenient for solving conflicts using unpull or
unrecord, for when you have draft work conflicting with upstream work.
msg8615 (view) Author: kowey Date: 2009-08-31.08:36:29
Merging in issue1588 which wants the opposite (would be covered by --match 'not

I guess there is an open question to resolve before we can implement this: I
mostly remember matchers as working only on PatchInfo (although the touch
matcher  changes this, I think).  Can we implement this with just local changes
to Darcs.Match, or does the rest of darcs need to be passing more information up
to it?
Date User Action Args
2008-12-09 10:50:00galbollecreate
2009-04-09 13:51:56koweysetstatus: unread -> needs-reproduction
nosy: + jaredj
topic: + ProbablyEasy
2009-08-23 22:16:26koweysetstatus: needs-reproduction -> needs-implementation
nosy: kowey, simon, thorkilnaur, jaredj, dmitry.kurochkin, galbolle
topic: - ProbablyEasy
2009-08-25 17:36:02adminsetnosy: + darcs-devel, - simon
2009-08-27 14:31:29adminsetnosy: kowey, darcs-devel, thorkilnaur, jaredj, dmitry.kurochkin, galbolle
2009-08-30 10:18:04koweysettopic: + Matchers
nosy: kowey, darcs-devel, thorkilnaur, jaredj, dmitry.kurochkin, galbolle
2009-08-31 08:33:32koweylinkissue1588 superseder
2009-08-31 08:36:41koweysetstatus: needs-implementation -> needs-reproduction
nosy: + ganesh, simonmar
topic: + Conflicts
messages: + msg8615
2009-09-05 22:45:38ganeshunlinkissue1588 superseder
2009-10-23 22:36:53adminsetnosy: + marlowsd, - simonmar
2009-10-23 23:35:23adminsetnosy: + simonmar, - marlowsd