darcs

Issue 1681 print the fact that conflicts were marked with red in the terminal

Title print the fact that conflicts were marked with red in the terminal
Priority wishlist Status resolved
Milestone Resolved in 2.8.0
Superseder Nosy List attila.lendvai, darcs-devel, dmitry.kurochkin, jaredj, johan.tibell
Assigned To
Topics Conflicts, ProbablyEasy, UI

Created on 2009-11-10.02:01:20 by attila.lendvai, last changed 2011-12-29.02:46:11 by noreply.

Messages
msg9231 (view) Author: attila.lendvai Date: 2009-11-10.02:01:12
the title says it all.

the diff view already uses colors, so the infrastructure is there. please use it
when printing the information notice about marked conflicts, because it's too
easy to miss it. especially when a script is pulling several repos...
msg14636 (view) Author: noreply Date: 2011-08-13.14:39:52
The following patch sent by Jeff Foster <jeff.foster@acm.org> updated issue issue1681 with
status=has-patch

* resolve issue1681: when there are conflicts, output red text. 
Ignore-this: 435534dfbc1918db4387f277630127ea
msg14801 (view) Author: markstos Date: 2011-10-28.02:33:30
This issue is supposedly resolved by this patch:

"resolve issue1681: when there are conflicts, output red text."
msg14896 (view) Author: noreply Date: 2011-12-29.02:46:10
The following patch sent by Jeff Foster <jeff.foster@acm.org> updated issue issue1681 with
status=resolved;resolvedin=2.8.0 HEAD

* resolve issue1681: when there are conflicts, output red text. 
Ignore-this: 435534dfbc1918db4387f277630127ea
History
Date User Action Args
2009-11-10 02:01:20attila.lendvaicreate
2009-11-24 00:51:44koweysetstatus: unknown -> needs-implementation
nosy: + jaredj
topic: + ProbablyEasy, Conflicts
2010-08-09 14:32:48koweysetnosy: + johan.tibell
2011-08-12 13:55:17JeffFosterlinkpatch646 issues
2011-08-13 14:39:53noreplysetstatus: needs-implementation -> has-patch
messages: + msg14636
2011-10-28 02:33:30markstossetstatus: has-patch -> resolved
messages: + msg14801
resolvedin: 2.5.4
2011-10-28 02:34:31markstossetresolvedin: 2.5.4 -> 2.8.0
2011-12-29 02:46:11noreplysetmessages: + msg14896