[darcs-devel] [issue2138] whatsnew --summary does not report conflict marker

[Lele Gaifax]

New submission from Lele Gaifax <lelegaifax at gmail.com>:

Accordingly to the "darcs whatsnew --help" documentation when two
patches produce a conflict the summary should report that with a "!",
but it does not as of darcs 2.5.2.

$ darcs wha
hunk ./f 2
+v v v v v v v
+=============
+Conflict on side R
+*************
+Conflict on side S
+^ ^ ^ ^ ^ ^ ^

$ darcs wha -s
M ./f +6

I'll send a test script as soon as I have the issue number back.

Thanks&bye, lele.

----------
messages: 15087
nosy: lelegaifax
status: unknown
title: whatsnew --summary does not report conflict marker

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue2138>
__________________________________