Issue 1912 avoid invisible conflicts

Title avoid invisible conflicts
Priority feature Status needs-reproduction
Milestone Resolved in
Superseder Nosy List Quiark, dmitry.kurochkin, johan.tibell, kowey
Assigned To
Topics Conflicts, UI

Created on 2010-08-09.14:05:57 by kowey, last changed 2010-09-19.08:10:10 by kowey.

msg12071 (view) Author: kowey Date: 2010-08-09.14:05:55
The effect of a conflict in Darcs is to cancel out all sides of the 
conflict.  This creates a lot of confusion and difficulty for users.  It 
means that conflicts can be effectively invisible.

We need a better way for users

1. to be notified that they have a conflict
2. to feel confident that they have successfully resolved the conflict

This is sort of a vague problem identification ticket, and may open up 
to other tickets in the future.

Some ideas proposed:
1. darcs revert -a should do a mark-conflicts afterwards (so that you 
revert to a conflicted state)
2. on push/pull/etc time, darcs should emit "WARNING: You have 
unresolved conflicts in this repository."

I think to make progress on this ticket, we need two things.

First: we need to remind ourselves what exactly Darcs's current 
behaviour is for notifying users that there is a conflict.  So we need 
somebody to read the code and/or just apply/pull some patches and write 
up what happens.  I seem to remember that pull/apply --mark-conflicts 
just tells you that (a) a conflict happened and (b) in what files.  Is 
that all we do?

Second: we need somebody to start a discussion on darcs-users fleshing 
out a UI for addressing this notification problem.  I'm planning to 
start one drawing all the conflict UI tickets together, but in case I 

(see also related tickets issue833 and issue1911)
msg12589 (view) Author: kowey Date: 2010-09-19.08:10:10
UI mockup from http://prezi.com/is5nzudw8jxq/darcs-in-2010/

$ darcs push
You still have local conflicts to resolve.
Type "yeah yeah, shut up" to proceed with push
Date User Action Args
2010-08-09 14:05:57koweycreate
2010-08-09 14:31:56koweysetnosy: + johan.tibell
2010-09-19 08:10:10koweysetmessages: + msg12589