darcs

Issue 1911 easy way to find out which patches conflict with which

Title easy way to find out which patches conflict with which
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.13:54:28 by kowey, last changed 2010-09-19.08:01:56 by kowey.

Messages
msg12070 (view) Author: kowey Date: 2010-08-09.13:54:26
There's a longish discussion on http://irclog.perlgeek.de/darcs/2010-08-
09#i_2679776 (stop at 13:39) about improving the Darcs conflicts UI.

One general point is that we need to make it easier to figure out for a 
given patch, which other patches it conflicts with.

An example might be to extend the darcs changes UI so that it displays 
this information (since it already shows you if the patch is a 
merger/conflictor), which may be hard.

Another may be some kind of command that lists conflicted patches and 
the patches they appear to conflict with.

This requires somebody to start a discussion on darcs-users to develop a 
sort of ideal UI.  I may start a thread gathering up all the conflict-
related stuff later.
msg12586 (view) Author: kowey Date: 2010-09-19.08:01:54
UI suggestion from http://prezi.com/is5nzudw8jxq/darcs-in-2010/:

$ darcs changes
Wed Sep  8 10:54:48 BST 2010  Eric Kow <kowey@darcs.net>
  * wibble foo to make brogulator a bit more efficient
CONFLICTS:
  * blop the flibble to avoid brogulator usage (bc38ef91)
  * tune brogulator some more (386ac991)

Tue Sep  7 20:47:32 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * blop the fibble to avoid brogulator usage
CONFLICTS:
  * wibble foo to make brogulator a bit more efficient (3298ffcc)
  * tune brogulator some more (386ac991)

Sun Aug 29 18:15:01 BST 2010  Petr Rockai <me@mornfall.net>
  * tune brogulator some more
CONFLICTS:
....

Another this could possibly do is to have a RESOLVED block that says
that patch resolves conflicts between such and such other patches.

One thing to keep in mind though is that conflicts may get long, nested,
and complicated.  So we may want to hammer out the UI a bit more, for
example by thinking about what kinds of redundant information we can
filter out.
History
Date User Action Args
2010-08-09 13:54:28koweycreate
2010-08-09 14:31:21koweysetnosy: + johan.tibell
2010-09-19 08:01:56koweysetmessages: + msg12586