darcs

Issue 833 wish: fancy conflict markers (with named patch)

Title wish: fancy conflict markers (with named patch)
Priority feature Status waiting-for
Milestone 3.0.0 Resolved in
Superseder Nosy List SamB, dmitry.kurochkin, johan.tibell, kowey, mornfall, simonmar, thorkilnaur, tommy
Assigned To
Topics Conflicts, UI

Created on 2008-05-02.19:37:56 by simon, last changed 2010-09-19.08:06:16 by kowey.

Messages
msg4497 (view) Author: simon Date: 2008-05-02.19:37:54
There isn't much substance to this report yet.

v v v.. * * *.. which hunk is which ?! Worst of all, I suspect the ordering is
not consistent. This makes resolving conflicts harder than it could be.
msg4562 (view) Author: kowey Date: 2008-05-07.16:22:44
I think this has come up before and that the wish is legit.  It would be nice
for conflict markers to give a hint about what patch a side of the conflict
comes from (maybe the first 60 chars of the patch description?)

Something like

v v v v (below: short description for patch a...)

* * * * (below: short description for patch b...)

* * * * (below: short description for patch c...)

^ ^ ^ ^

David: this is feasible in theory, right?
msg5392 (view) Author: mornfall Date: 2008-08-12.09:18:43
Me wants! (I am willing to throw time at this, when my other two issues are
resolved.)
msg5394 (view) Author: kowey Date: 2008-08-12.09:27:29
I hear this is "non-trivial" to implement.  Any comments, Jason and David?
msg5400 (view) Author: droundy Date: 2008-08-12.13:50:55
Yes, definitely very hard.  You'd probably pretty much have to write a
function that given a primitive patch looks for a possible name for
it.  I definitely wouldn't try doing this without using the type
witnesses to keep me honest.

David

On Tue, Aug 12, 2008 at 2:27 AM, Eric Kow <bugs@darcs.net> wrote:
> I hear this is "non-trivial" to implement.  Any comments, Jason and David?
msg7392 (view) Author: SamB Date: 2009-03-03.18:11:39
Hard or not, something like this is really really important.
msg7395 (view) Author: kowey Date: 2009-03-03.20:40:17
I agree.  At the very least, we should have a clearer idea what are the
pre-requisites for getting this one done.

As a minimum, it sounds like we should make sure the type witnesses work is
complete.

Next, Ian has suggested that it may be a lot easier to do this once we have
named primitive patches.  I suspect a good first step would be for us to see Ian
implementing it in camp...
msg7817 (view) Author: kowey Date: 2009-05-16.07:06:47
I realised that we've been giving the wrong impression about this issue, so I
want to make it clear that this is a *high priority* bug for us.

On the other hand, the most efficient way for us to fix this, as far as I
understand, is to first get the camp patch theory right, which gives us named
primitive patches.  So I'm marking this Target-3.0
msg12588 (view) Author: kowey Date: 2010-09-19.08:06:15
I've moved the question of conflict marking not being consistent to
issue1958

Also, here is a UI mockup from http://prezi.com/is5nzudw8jxq/darcs-in-2010/:

v v v v v v v (3298ffcc - wibble foo to make...)
foo
* * * * * * *
bar
^ ^ ^ ^ ^ ^ ^ ^ (bc38ef91 - blop the flibble...)

I really need to learn how to come up with examples without resorting to
nonsense words
History
Date User Action Args
2008-05-02 19:37:56simoncreate
2008-05-07 16:22:46koweysetstatus: unread -> unknown
nosy: + droundy, kowey
messages: + msg4562
title: conflict markers are confusing! -> wish: fancy conflict markers (with named patch)
2008-05-07 16:23:10koweysettopic: + UI
nosy: droundy, tommy, beschmi, kowey, dagit, simon
2008-08-12 09:18:46mornfallsetnosy: + mornfall
messages: + msg5392
2008-08-12 09:24:26koweylinkissue986 superseder
2008-08-12 09:27:33koweysetpriority: wishlist -> feature
nosy: droundy, tommy, beschmi, kowey, dagit, simon, mornfall
messages: + msg5394
2008-08-12 13:51:00droundysetnosy: droundy, tommy, beschmi, kowey, dagit, simon, mornfall
messages: + msg5400
2009-03-03 18:11:42SamBsetnosy: + dmitry.kurochkin, SamB, thorkilnaur
messages: + msg7392
2009-03-03 18:23:36droundysetnosy: - droundy
2009-03-03 20:40:21koweysetnosy: + igloo
messages: + msg7395
2009-05-16 07:06:56koweysettopic: + Target-3.0
nosy: + marlowsd
messages: + msg7817
2009-08-06 21:04:00adminsetnosy: - beschmi
2009-08-11 00:12:34adminsetnosy: - dagit
2009-08-18 23:01:09koweysetstatus: unknown -> deferred
nosy: tommy, kowey, SamB, igloo, simon, thorkilnaur, dmitry.kurochkin, marlowsd, mornfall
2009-08-25 17:18:55adminsetnosy: + darcs-devel, - igloo
2009-08-25 17:23:48adminsetnosy: - simon
2009-08-25 19:04:41koweysetstatus: deferred -> (no value)
nosy: tommy, kowey, darcs-devel, SamB, thorkilnaur, dmitry.kurochkin, marlowsd, mornfall
2009-08-25 19:04:51koweysetstatus: unknown
nosy: tommy, kowey, darcs-devel, SamB, thorkilnaur, dmitry.kurochkin, marlowsd, mornfall
2009-08-25 19:05:01koweysetstatus: unknown -> deferred
nosy: tommy, kowey, darcs-devel, SamB, thorkilnaur, dmitry.kurochkin, marlowsd, mornfall
2009-08-27 14:32:34adminsetnosy: tommy, kowey, darcs-devel, SamB, thorkilnaur, dmitry.kurochkin, marlowsd, mornfall
2009-10-23 23:34:57adminsetnosy: + simonmar, - marlowsd
2010-06-15 21:10:39adminsettopic: - Target-3.0
2010-06-15 21:10:40adminsetmilestone: 3.0.0
2010-07-15 13:35:23koweysettopic: + Conflicts
2010-07-15 13:37:27koweysetassignedto: igloo
nosy: + igloo
2010-07-15 13:37:48koweysetstatus: deferred -> waiting-for
2010-07-15 13:41:33koweysetnosy: - darcs-devel, igloo
assignedto: igloo ->
2010-08-09 14:33:26koweysetnosy: + johan.tibell
2010-09-19 08:06:16koweysetmessages: + msg12588