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.

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?

Me wants! (I am willing to throw time at this, when my other two issues are
resolved.)

I hear this is "non-trivial" to implement.  Any comments, Jason and David?

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?

Hard or not, something like this is really really important.

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...

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

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

Indeed we should get this resolved for the darcs-3 format.