|
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
conflicted')
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:00 | galbolle | create | |
2009-04-09 13:51:56 | kowey | set | status: unread -> needs-reproduction nosy:
+ jaredj topic:
+ ProbablyEasy |
2009-08-23 22:16:26 | kowey | set | status: needs-reproduction -> needs-implementation nosy:
kowey, simon, thorkilnaur, jaredj, dmitry.kurochkin, galbolle topic:
- ProbablyEasy |
2009-08-25 17:36:02 | admin | set | nosy:
+ darcs-devel, - simon |
2009-08-27 14:31:29 | admin | set | nosy:
kowey, darcs-devel, thorkilnaur, jaredj, dmitry.kurochkin, galbolle |
2009-08-30 10:18:04 | kowey | set | topic:
+ Matchers nosy:
kowey, darcs-devel, thorkilnaur, jaredj, dmitry.kurochkin, galbolle |
2009-08-31 08:33:32 | kowey | link | issue1588 superseder |
2009-08-31 08:36:41 | kowey | set | status: needs-implementation -> needs-reproduction nosy:
+ ganesh, simonmar topic:
+ Conflicts messages:
+ msg8615 |
2009-09-05 22:45:38 | ganesh | unlink | issue1588 superseder |
2009-10-23 22:36:53 | admin | set | nosy:
+ marlowsd, - simonmar |
2009-10-23 23:35:23 | admin | set | nosy:
+ simonmar, - marlowsd |
|